| commit | 712e5b885381bc7c2cfd684941e087d5f2e9e6ef | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 21:47:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 21:47:37 2014 +0000 |
| tree | 06187c7f365c77d162cc288fac693aeef9772313 | |
| parent | e2f6024c2e19bf3cfe100accba5db92b1c9b9636 [diff] | |
| parent | 99816c1d6e6cd42888ef1c62ac9974e14e244e5f [diff] |
am 99816c1d: (-s ours) am e48121ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '99816c1d6e6cd42888ef1c62ac9974e14e244e5f': Import translations. DO NOT MERGE