commit | 9300c1cf1cba71c78cdc1aa52f084e562a57b402 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 14 12:29:06 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 14 12:29:06 2016 +0000 |
tree | a892f050ed90ceabb3e6ad69623c22058434b6e7 | |
parent | 9e3e28b1bd6474811879c8a6a3ac11a3bceb0302 [diff] | |
parent | 70c36466ca586603a70e73e4d9aa05d33e44b06b [diff] |
Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: bb8b32262f -s ours am: 960a0a8fec -s ours\" into nyc-mr1-dev-plus-aosp am: 70c36466ca -s ours Change-Id: Iba9c2779c825ceabd1e8738b8b784c1d509d34ab