commit | 70f0bb3937af9355a9aafcabc191b8991fae8ad2 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jun 03 17:26:08 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 03 17:26:10 2016 +0000 |
tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 | |
parent | 68254909b326b91fd408f98fc80ed6114db7b078 [diff] | |
parent | 165784c49ed33f18e096fb180d8d622bb8fc2bbd [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours am: 498f780f42 -s ours" into nyc-mr1-dev-plus-aosp