| commit | d959590678d2cb4fa5f63c11db15bcbb712c11c5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 07 00:36:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 00:36:37 2014 +0000 |
| tree | ae58a0b11552898f2cf79f87ee323d4d62d36063 | |
| parent | fb85d4aa3dedd9945759038821528072ecf80ced [diff] | |
| parent | 28e65b2f7cc596313fdb765f935ccab082d2287a [diff] |
am 28e65b2f: (-s ours) am 77b3cc81: (-s ours) am 9867cbe7: (-s ours) am 6ccf3681: (-s ours) am dec34b5f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '28e65b2f7cc596313fdb765f935ccab082d2287a': Import translations. DO NOT MERGE