summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2017-09-18 17:14:39 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-18 17:14:39 +0000
commit74db30a6bfe36b9aabee6b4c3ce20875b01a459c (patch)
treeb4bc3b0df7cfcd55ce866ea1e2e49ab30d0276e8 /AndroidManifest.xml
parentadc7bb8212312209eb170b63ceb6c52430c65a77 (diff)
parent47929add9f0d24e71321f001b19dbee06c0f607a (diff)
Merge changes I6443a05c,Ie840acd6
am: 47929add9f Change-Id: I8aac3201ddee0ef87738a310a12844725c8ef555
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions