tree 6b6eddde884f49cabdbd8ee60e445d12151407b0
parent 49c03cc8183f8a128f68ecf777cbe7ce9ac7d021
parent ac6a76d29f884e4229947a1d8d66315f61d32744
author Dirk Dougherty <ddougherty@google.com> 1362020254 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362020254 -0800

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

* commit 'ac6a76d29f884e4229947a1d8d66315f61d32744':
  Doc change: update 'multiple apks' criteria in filters doc.