summaryrefslogtreecommitdiffstats
path: root/tests/permission
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-01-26 21:59:12 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-26 21:59:12 +0000
commit3d62078498e8e9f7552d49f5f5e53ec339f4c2ce (patch)
tree45d3aa409ceb9c9c74c1bfa78547a6d5a53614e2 /tests/permission
parent5b53481a864b09157f6e4f483d6a0e4d9f615d2a (diff)
parentbfe3c357043badac546fbf84d28ee8a81ccc1208 (diff)
downloadframeworks_base-3d62078498e8e9f7552d49f5f5e53ec339f4c2ce.zip
frameworks_base-3d62078498e8e9f7552d49f5f5e53ec339f4c2ce.tar.gz
frameworks_base-3d62078498e8e9f7552d49f5f5e53ec339f4c2ce.tar.bz2
am 6d4a6845: Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev automerge: 8df7f43
automerge: bfe3c35 * commit 'bfe3c357043badac546fbf84d28ee8a81ccc1208': Update system-api for new getLine1Number() method.
Diffstat (limited to 'tests/permission')
0 files changed, 0 insertions, 0 deletions