| commit | 3a96381c6918519bd69357b67f28c8761fd369fb | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Thu Jan 25 22:10:31 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 25 22:10:31 2018 +0000 |
| tree | 3487fa71e89f49afb41baa3db08fbc16f14bb648 | |
| parent | d19ef3fa1bfbd89cf494002de98a672448ee98ab [diff] | |
| parent | 79a38db63e9b93c62878d4a811d7043be12eed66 [diff] |
Merge changes from topic "am-8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp * changes: Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev am: 806b4573aa am: 981bc5a1ac am: 38508aeaf5 [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb am: 0a09cd4b21 -s ours am: cd4371f3cc -s ours am: ea52aec628 -s ours