summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-02-12 19:40:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-12 19:40:59 +0000
commit28439f261b178758a985b8eb78e408e643fd1057 (patch)
tree4b9829981f69c6da7c0d31a28c76272d27bfbe51
parent47a0e664b86b3584e294fd326f5c776b73f2e25a (diff)
parent615adb8bc80efa8c4b6d45387a500e8ab77bc692 (diff)
downloadframeworks_base-28439f261b178758a985b8eb78e408e643fd1057.zip
frameworks_base-28439f261b178758a985b8eb78e408e643fd1057.tar.gz
frameworks_base-28439f261b178758a985b8eb78e408e643fd1057.tar.bz2
am 615adb8b: (-s ours) am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '615adb8bc80efa8c4b6d45387a500e8ab77bc692': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions