| commit | a5ccc25fb797d45f39485319b463b1518ab5a115 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Mar 25 15:42:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 25 15:42:10 2015 +0000 |
| tree | ed2a7ae9c564d6f2c24b509e937605777759530c | |
| parent | a91e9e5403bdafe3df9d40a94035618e4f98eb9f [diff] | |
| parent | 3325448639df3ae629fbb33666c9e6c25d306a28 [diff] |
am 33254486: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '3325448639df3ae629fbb33666c9e6c25d306a28': Import translations. DO NOT MERGE