summaryrefslogtreecommitdiffstats
path: root/location/Android.mk
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-02-27 00:51:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-27 00:51:40 +0000
commit1b4b87c2aec1ea5487e7279e92114bb1dca013b6 (patch)
tree1bf933ea1eafaf54e768c580fdda84e590c3d474 /location/Android.mk
parent28e682cb5dfb24e7aaa668a6d1edd4589c153180 (diff)
parent4d9031bda69fbf7b48241539788db8560b3953b2 (diff)
downloadframeworks_base-1b4b87c2aec1ea5487e7279e92114bb1dca013b6.zip
frameworks_base-1b4b87c2aec1ea5487e7279e92114bb1dca013b6.tar.gz
frameworks_base-1b4b87c2aec1ea5487e7279e92114bb1dca013b6.tar.bz2
am 4d9031bd: (-s ours) am 50b04190: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '4d9031bda69fbf7b48241539788db8560b3953b2': Import translations. DO NOT MERGE
Diffstat (limited to 'location/Android.mk')
0 files changed, 0 insertions, 0 deletions