tree 43955037edfd35289a2d4698d5f7bc8059f7d97a
parent 2198945e3231f3a2fc2b1e8d00bfa8f322abfd3a
parent f67c5a74b4b68dbcd6f141607e1798de47e11d91
author Dirk Dougherty <ddougherty@google.com> 1362517789 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517789 -0800

am f67c5a74: am e1d8df45: am f80cb186: am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev

* commit 'f67c5a74b4b68dbcd6f141607e1798de47e11d91':