commit | be4af750bcbb3046a55a466e1beeb40d024e193c | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Jan 29 01:22:57 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 01:22:57 2015 +0000 |
tree | 4166f35e207a2990be6928d39dcc40a24f208838 | |
parent | 6292607e0d4c218880bae269a235fd2944cc4d74 [diff] | |
parent | 813f6d801f5b38d50d5f15ce399457032e005186 [diff] |
am 813f6d80: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '813f6d801f5b38d50d5f15ce399457032e005186': Import translations. DO NOT MERGE