commit | 672e1ddb149bd311eaa7b24b443d30e073efb65d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 21 16:56:44 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 16:56:44 2016 +0000 |
tree | 79b7ec2ff4dac6693d767b8d5e279cd50008baec | |
parent | 5903be35f48376b4a4a983796eb7051b799778e4 [diff] | |
parent | f315e2e6f046c951f01ababbd32eee3fb9d4797c [diff] |
Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: f315e2e6f0 -s ours Change-Id: I8216d1ead0653fff4d1a335f11ff92879d587fcc