diff options
author | The Android Automerger <android-build@android.com> | 2012-07-26 17:49:54 -0700 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2012-07-26 17:49:54 -0700 |
commit | 156c71e4b217d7da285ccc82e56d92f2b1874db5 (patch) | |
tree | 387ae28327fc1567316592a6917f45d4d6171c60 /jni/Android.mk | |
parent | 43f226312d34edc17a6319f7d61a06d20e1850e7 (diff) | |
parent | fd4b41a42a5b21acb11d4a78f9b0266841f9fd2c (diff) | |
download | packages_apps_nfc-156c71e4b217d7da285ccc82e56d92f2b1874db5.zip packages_apps_nfc-156c71e4b217d7da285ccc82e56d92f2b1874db5.tar.gz packages_apps_nfc-156c71e4b217d7da285ccc82e56d92f2b1874db5.tar.bz2 |
merge in jb-mr0-release history after reset to jb-dev
Diffstat (limited to 'jni/Android.mk')
0 files changed, 0 insertions, 0 deletions