| commit | eb5b7721df47a601d3707a7bcbf32d61efe09c5b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 21:47:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 21:47:16 2014 +0000 |
| tree | f4224c15188eea2027f8737b50eddf4e601d9bf1 | |
| parent | a7ddb536fd9ed69f8436f1f786ca576fd34effa3 [diff] | |
| parent | e21824491ee47ecc35376b9fd909a07416276f29 [diff] |
am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'e21824491ee47ecc35376b9fd909a07416276f29': Import translations. DO NOT MERGE