commit | 0e5c1144e992109bcf6df1016bc30b19eeeb420d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 03:29:48 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 03:29:48 2016 +0000 |
tree | 79a44fc679f60b9569eee0e1a117a200b78e4d9d | |
parent | 810a70cc5a5a043fad4338a41673026d8011e704 [diff] | |
parent | 5abcce865e1e5fe183cab6533532e8674d9d3b12 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 8c9d0dbeda -s ours am: 5abcce865e -s ours Change-Id: If70b60d90262aa98775d2ba6929c48a2de70cf51