commit | cddfbd18d11d8ab9993c82e9e40db6b813ac3dec | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 20 10:23:00 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 10:23:00 2017 +0000 |
tree | 02a0e042e1e2e002ed79fd16512450c069dfb74d | |
parent | 5b595004084ce24df98e542fb09dcffdfdd6d32b [diff] | |
parent | 8a630470e833434e468585e35332b8769cca95c5 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3f9462d6a3 -s ours am: 612bc3c9b8 -s ours" into oc-mr1-dev-plus-aosp am: 8a630470e8 -s ours Change-Id: I69ea946a07754daf13f182250c5cc445796c7547