summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-02-12 23:12:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-12 23:12:00 +0000
commit2343e69a8e20b5372c670652fa5befc013ded3d6 (patch)
tree2b0443778f446ed62174af3633d69cf14fe3e540
parente2d143a1cc5ad76736ac746acf6a08330abe04d3 (diff)
parentf23a517add2ad6c587bcfa691a1ac048818a39de (diff)
downloadframeworks_base-2343e69a8e20b5372c670652fa5befc013ded3d6.zip
frameworks_base-2343e69a8e20b5372c670652fa5befc013ded3d6.tar.gz
frameworks_base-2343e69a8e20b5372c670652fa5befc013ded3d6.tar.bz2
am f23a517a: (-s ours) am dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'f23a517add2ad6c587bcfa691a1ac048818a39de': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions