summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-02-12 23:11:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-12 23:11:56 +0000
commite2d143a1cc5ad76736ac746acf6a08330abe04d3 (patch)
tree2b0443778f446ed62174af3633d69cf14fe3e540
parent7a647ab30f9b3e6e0a9d890c7bfddb10015e0f4c (diff)
parentdf45d644b6fd4dda8d2e2b650ce262a2c5b3fe79 (diff)
downloadframeworks_base-e2d143a1cc5ad76736ac746acf6a08330abe04d3.zip
frameworks_base-e2d143a1cc5ad76736ac746acf6a08330abe04d3.tar.gz
frameworks_base-e2d143a1cc5ad76736ac746acf6a08330abe04d3.tar.bz2
am df45d644: (-s ours) am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'df45d644b6fd4dda8d2e2b650ce262a2c5b3fe79': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions