summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2015-10-20 00:53:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-20 00:53:44 +0000
commit27602cefb431f050ef8657f72fde43c8470dc53a (patch)
treee01206b15f63afe1c083acf62abf27627da782cc
parent858f907ce46b031885fe631879a07fbff5daaa3e (diff)
parent80fa64f36f37daefd4515dc3468da1ca3ed71014 (diff)
downloadNfc-27602cefb431f050ef8657f72fde43c8470dc53a.tar.gz
Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443
am: 80fa64f36f * commit '80fa64f36f37daefd4515dc3468da1ca3ed71014':
0 files changed, 0 insertions, 0 deletions