| commit | f9e39512a968f8bb1a81fff81092068a16830f7e | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri May 27 16:52:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 27 16:52:47 2016 +0000 |
| tree | 217a62549bfd469460e2911e2485b8a665a74d6f | |
| parent | d38650cf71139ade3691ad9084cbb66142cdbb73 [diff] | |
| parent | 5cc2c12f29e0d186da4449b8ef0c7569d01af1b7 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours am: 02befc3229 -s ours" into nyc-mr1-dev-plus-aosp am: 5cc2c12f29 -s ours * commit '5cc2c12f29e0d186da4449b8ef0c7569d01af1b7': Import translations. DO NOT MERGE Change-Id: I7b7fbe10fc11334a14b3044c34ee82af67515046