summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2015-10-20 03:21:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-20 03:21:21 +0000
commit6fc59e8a80b9a973f6831bc7482fc849d1fc252f (patch)
tree58b6ca77ae2e82e9530fa8468301c666e93a9b67
parentf08a81c4607350683f2061f0fcf6421f01440175 (diff)
parent0bc4de4d32283267d661301e7dc9e17301b88954 (diff)
downloadandroid_packages_apps_Nfc-6fc59e8a80b9a973f6831bc7482fc849d1fc252f.tar.gz
android_packages_apps_Nfc-6fc59e8a80b9a973f6831bc7482fc849d1fc252f.tar.bz2
android_packages_apps_Nfc-6fc59e8a80b9a973f6831bc7482fc849d1fc252f.zip
Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 am: 5be57758c0 am: 784ae49eb5 am: 3fdb2ab38c am: 7aeb11db61 am: 1c27289895 am: 21ee8b28d1
am: 0bc4de4d32 * commit '0bc4de4d32283267d661301e7dc9e17301b88954':
0 files changed, 0 insertions, 0 deletions