diff options
author | Dirk Dougherty <ddougherty@google.com> | 2013-02-28 03:03:07 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-28 03:03:07 +0000 |
commit | c732976e6b40be5a23eee2df2bff23101abc1f91 (patch) | |
tree | 3efd1c85cde72e439bb59b85a69c2b3c1b25803a /core/jni/android | |
parent | 2a45b9fe99b10baeedb9c4529dcc5177ad7e3584 (diff) | |
parent | 08a551b4ad02946c62efc5161d16d35bdbc48071 (diff) | |
download | frameworks_base-c732976e6b40be5a23eee2df2bff23101abc1f91.zip frameworks_base-c732976e6b40be5a23eee2df2bff23101abc1f91.tar.gz frameworks_base-c732976e6b40be5a23eee2df2bff23101abc1f91.tar.bz2 |
am 08a551b4: am f132ac4f: am ac6a76d2: am f19dd2b5: am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev
* commit '08a551b4ad02946c62efc5161d16d35bdbc48071':
Doc change: update 'multiple apks' criteria in filters doc.
Diffstat (limited to 'core/jni/android')
0 files changed, 0 insertions, 0 deletions