summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2015-07-15 23:21:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-15 23:21:30 +0000
commitbd7c7736518c8f4393b6a66824b0ead175d15d78 (patch)
tree78638eadd6ff855b70edfea89508c73c7cb98aed /Android.mk
parentd099a9f7113d4d530539a3b81ec7880994c17c15 (diff)
parent597e4df3d7a2dad587c71210364a75f729eb181a (diff)
am 597e4df3: am 70f2f9de: am fb9c5391: Merge "Change Settings name to "Phone"" into mnc-dev
* commit '597e4df3d7a2dad587c71210364a75f729eb181a': Change Settings name to "Phone"
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions