| commit | 87f3627ade3bdad4bd05986f67d192abe19d7935 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 20:46:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 20:46:14 2014 +0000 |
| tree | 5755e19247b15dc06d9d5bafbe3874cb58c5e1fc | |
| parent | d85015ee420283caf140b8d6723ed244f8493c8f [diff] | |
| parent | 3673604318ad7ab198de3734ad0a470a4c37c64e [diff] |
am 36736043: (-s ours) am a7f905f0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '3673604318ad7ab198de3734ad0a470a4c37c64e': Import translations. DO NOT MERGE