| commit | 809af77b67e82a0e05e635c48d957faab651a9fa | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Fri Jan 26 01:12:25 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 26 01:12:25 2018 +0000 |
| tree | 56caf46ef55a654da80b91a69e6dc7ccfc782dea | |
| parent | c91d86152a87b16310d79a5ed5fc3701566f6801 [diff] | |
| parent | 4ea85eb6d5f0d429763fccd24b7bcf5d56ce0d8d [diff] |
Merge changes from topic "am-1e00ca1a840d4d319db537c2c1612f26" * changes: Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into oc-dev am: 6367f8199d am: f1d0f9652c am: 33e2d30f87 am: e95f894e67 [automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 skipped: ccc16f92d7 am: 387047a201 -s ours am: f12ba9fee4 -s ours am: 3c2c04a47d -s ours am: ab6b536629 -s ours