commit | c0ad92de7221e04ef246cb0e11e9fc3034536876 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Aug 15 20:28:06 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 15 20:28:06 2016 +0000 |
tree | ad85a4df4ebe5cc7288ad653027e5f8373f4331a | |
parent | a7f481e711a395fffc2141c8d97fc36c8dd4b472 [diff] | |
parent | e412d5689a94380516b7c0e14ac4edf4eb810f80 [diff] |
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 23df877a81 -s ours am: e412d5689a -s ours Change-Id: I0617d3abc859b7ee3233faecc80e2c2a5d9c592b