summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-06-06 22:04:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-06 22:04:14 +0000
commit0cefbc7d1133d0c9df5b9265d2acd1d3315daf6e (patch)
treea704e065ec4a5c3b2c41c309a870dce41a938245 /AndroidManifest.xml
parent49378067cde003c0443d6837c01085ee63482889 (diff)
parent77762c586d861bcc90ec9ac0211dddc886df4db0 (diff)
am 77762c58: (-s ours) DO NOT MERGE Material theme
* commit '77762c586d861bcc90ec9ac0211dddc886df4db0': DO NOT MERGE Material theme
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions