commit | 493fa06f623304768d2e38ab7f90a8fecb9cbc6d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 21 17:17:44 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 17:17:44 2016 +0000 |
tree | 3a41daf45d0db9673e44e18a6df4a084967980de | |
parent | 009b86ae02c5442d1c98c0173e375a145924def1 [diff] | |
parent | 81c6e4b4e07c77c4f48b6b2f90dcab1dea174380 [diff] |
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am: 81c6e4b4e0 -s ours Change-Id: I512a428809562ba7ba6d3c0e4789051fec031c4a