| commit | 29efa6b5dfee1c25999d448aa4c7b5308988d5a8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 30 19:20:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 19:20:07 2014 +0000 |
| tree | c29a7c4edaa2673178c485299d7c1c61a511a151 | |
| parent | 4ce66f19b52e192339ba3668cb4a7156439fbf5c [diff] | |
| parent | c609f4db3f08ef14db1612ac50af5e4e8aa1c580 [diff] |
am c609f4db: (-s ours) am a8a2844a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: ef3d9bc -s ours * commit 'c609f4db3f08ef14db1612ac50af5e4e8aa1c580': Import translations. DO NOT MERGE