commit | 72f0fd0cd30470463b7f4df19882f8947ee1b9ab | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jul 26 08:35:43 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 26 08:35:43 2017 +0000 |
tree | 2268ab4e8b606824b5b19b7835a46d5759b9689a | |
parent | 4ca3a013266e48be682ebf708f26f75cf622437a [diff] | |
parent | cd126286ed7c36ec7901ea3f1a299ddcb63a509f [diff] |
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 0ad45f6f76 -s ours" into oc-dr1-dev-plus-aosp am: eb5a73f4ec -s ours" into oc-mr1-dev-plus-aosp