summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-10-08 16:24:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-08 16:24:15 +0000
commit67ebe74e63b6769ba2acc04680b010a06e5c0177 (patch)
tree7be2e273009caf94e4a57781f0319ad5d939adfa
parent6616c6e2441af98bb56dd52c5cfdcd297d545e2a (diff)
parentfd7adc36f681765db78a99f74932e6c47b3955ee (diff)
downloadframeworks_base-67ebe74e63b6769ba2acc04680b010a06e5c0177.zip
frameworks_base-67ebe74e63b6769ba2acc04680b010a06e5c0177.tar.gz
frameworks_base-67ebe74e63b6769ba2acc04680b010a06e5c0177.tar.bz2
am fd7adc36: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'fd7adc36f681765db78a99f74932e6c47b3955ee': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions