commit | 8142017f62a93f636a3e72dbb0d18302173fe9dd | [log] [tgz] |
---|---|---|
author | Ruchi Kandoi <kandoiruchi@google.com> | Mon Jan 29 18:25:10 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jan 29 18:25:10 2018 +0000 |
tree | 3125bb2a8a78d9be8708d24c5f73162502b4f116 | |
parent | 753f3259091d129f555732abfc3923a3d9e1a9ff [diff] | |
parent | 626f665a655f282d1bccada6141bcf280d72e7ba [diff] |
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406 am: 626f665a65 Change-Id: I562b46b71416406e2640fc84f7b6a064327a7ca8