| commit | 6049f362c9569b87780495fb58838bff6ce8aef1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 15 14:47:27 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 15 14:47:27 2014 +0000 |
| tree | 26d19ad333c422307f5aa9a2180498e6a8d0c42c | |
| parent | 1363c92690daadc6f4592f6cb33fa1addf26c8c6 [diff] | |
| parent | 0736ee2631372a930f9b3c2919ef3b893ce8918a [diff] |
am 0c8802bb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 0736ee2 -s ours * commit '0736ee2631372a930f9b3c2919ef3b893ce8918a': Import translations. DO NOT MERGE