commit | b8e14ad3481a831ac5beb56b163cae9e1c626787 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Feb 03 08:50:56 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 08:50:56 2017 +0000 |
tree | a03809f72ed8d9a78573d4939ab86d2f12f5cee6 | |
parent | db01e80fe06095ea6f5fbe1fcf89753d8d123c88 [diff] | |
parent | 3b34a40c74903b06ec85ed6877d736fa7907f719 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 384007ac74 -s ours am: 3b34a40c74 -s ours Change-Id: Icac4bb5a9a9ee58aaa73e4014174dc6d65ecae8a