| commit | 6b873a0db126c2b93cd1310d863f7280f8a72b25 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 15 15:20:08 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 15 15:20:08 2014 +0000 |
| tree | 880742e580e6f4a7444b49e4a8b8cb45ad3b417f | |
| parent | 38706fc7994d8aa34555a8bc8d5037f6df2daca3 [diff] | |
| parent | ea964156460bbe8ab8f03c8de5f9f529234d69ce [diff] |
am b73e02cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: ea96415 -s ours * commit 'ea964156460bbe8ab8f03c8de5f9f529234d69ce': Import translations. DO NOT MERGE