summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-11-17 19:48:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-17 19:48:02 +0000
commitafe050a8718720f546f5ea17c9f92fdeb6da8895 (patch)
tree236bbe1c4e94d78026186eced17f485024bcffa9 /AndroidManifest.xml
parentae8e9cd6dac9f11745ec139a39c4dd9288f4719e (diff)
parent0274a22bd9c8fd6037c6a251174dd92ddeada016 (diff)
am 0274a22b: Merge "Add a color for settings button." into lmp-mr1-dev
* commit '0274a22bd9c8fd6037c6a251174dd92ddeada016': Add a color for settings button.
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions