commit | 63cfdfc02e306e81df69bbe1239747c5cfa588f8 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Aug 01 07:51:40 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 01 07:51:40 2017 +0000 |
tree | 9550537e69552e70548a02594e5aa8d58035dfe1 | |
parent | 4dd0c0b4b66bff524b712240ae03950f4803287d [diff] | |
parent | e858e9b36d2817a55cbd50858544e3ba2f6b3ec8 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 -s ours am: fb80235f41 -s ours" into oc-mr1-dev-plus-aosp