commit | e6eba20c1519e710b9e029f6392d30cdb4ecda83 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Sat Jul 22 17:20:10 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Jul 22 17:20:10 2017 +0000 |
tree | c687fb1ed10c2d9bca3206b7385d2fec5fc70fdc | |
parent | c6875184b6506bfb615c84d0eb28ec4715b89d5c [diff] | |
parent | 9caeec066dc409c90a0c4e652b371508863aeef7 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae -s ours am: 85de7f20ab -s ours" into oc-mr1-dev-plus-aosp