summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2014-11-21 00:43:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-21 00:43:45 +0000
commit0d4a4e6e59267ed58d9fe44303e400877aa1caab (patch)
treee7dab29b1dc0eee9b919424b86d466b8bb884151 /test-runner
parentbbf0f662a8a54e6c8c49a58b7a7273fe8756ff45 (diff)
parenta603f083ff8dbbc5ed2803d8f402accac135d891 (diff)
downloadframeworks_base-0d4a4e6e59267ed58d9fe44303e400877aa1caab.zip
frameworks_base-0d4a4e6e59267ed58d9fe44303e400877aa1caab.tar.gz
frameworks_base-0d4a4e6e59267ed58d9fe44303e400877aa1caab.tar.bz2
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.
Diffstat (limited to 'test-runner')
0 files changed, 0 insertions, 0 deletions