| commit | d1141978f5b95860c654cbf5685e2a6c47449df3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 15 15:27:09 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 15 15:27:09 2014 +0000 |
| tree | 880742e580e6f4a7444b49e4a8b8cb45ad3b417f | |
| parent | 6b873a0db126c2b93cd1310d863f7280f8a72b25 [diff] | |
| parent | 7f2116d1dbe1099fc44c0ad57cd5efdc4a9583d9 [diff] |
am 301a6176: (-s ours) am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 7f2116d -s ours * commit '7f2116d1dbe1099fc44c0ad57cd5efdc4a9583d9': Import translations. DO NOT MERGE