tree 62d3c238344d3ad60041f40643546be2ba2c515d
parent 65b7d5a4b39eee0ad184f5b81442786ff0fd06e9
parent f19dd2b50ee64be29e034f2d5ca29ab5117ba27e
author Dirk Dougherty <ddougherty@google.com> 1362020163 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362020163 -0800

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

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