tree c819f921f5d728f11fdf86b83b278bdfa9406722
parent 951205538c62ca39a14cb0a6ae33a01db3fffc0c
parent e1d8df4536d871cb1891c637ba61f8ff617507b3
author Dirk Dougherty <ddougherty@google.com> 1362517599 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517599 -0800

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

* commit 'e1d8df4536d871cb1891c637ba61f8ff617507b3':