commit | 0d4a4e6e59267ed58d9fe44303e400877aa1caab | [log] [tgz] |
---|---|---|
author | Martijn Coenen <maco@google.com> | Fri Nov 21 00:43:45 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 00:43:45 2014 +0000 |
tree | e7dab29b1dc0eee9b919424b86d466b8bb884151 | |
parent | bbf0f662a8a54e6c8c49a58b7a7273fe8756ff45 [diff] | |
parent | a603f083ff8dbbc5ed2803d8f402accac135d891 [diff] |
am a603f083: am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev * commit 'a603f083ff8dbbc5ed2803d8f402accac135d891': Verify NFC permission immediately on API calls.