| commit | 137cc5d34e147339948f60f52564679be32a99db | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:19:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:19:09 2015 +0000 |
| tree | dde12831e3589ec9f2f2bd657262786dc7c94ae4 | |
| parent | 39befa785c1fdbbbd72e10ea0aea7a6f6e09febc [diff] | |
| parent | b48a6519cc412aae55ef8914209b09d87f801603 [diff] |
am b48a6519: (-s ours) am fa18dac7: (-s ours) am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b48a6519cc412aae55ef8914209b09d87f801603':