summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-02-12 23:05:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-12 23:05:13 +0000
commit8a18ac3d858262b93ba7270e99e25c261892bc80 (patch)
treece7cec99f0dd32e67464e93a42927f9da159c155
parentf23a517add2ad6c587bcfa691a1ac048818a39de (diff)
parent7c958e2df0375761a1851cd02ca3aac3ee95f1c5 (diff)
downloadframeworks_base-8a18ac3d858262b93ba7270e99e25c261892bc80.zip
frameworks_base-8a18ac3d858262b93ba7270e99e25c261892bc80.tar.gz
frameworks_base-8a18ac3d858262b93ba7270e99e25c261892bc80.tar.bz2
am 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '7c958e2df0375761a1851cd02ca3aac3ee95f1c5': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions