commit | d3794705dda61f0b38c7113895f10435520343e1 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 09 14:29:03 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 09 14:29:03 2016 +0000 |
tree | f26a9b11a2eca484c290e34eff309d39fd5396c9 | |
parent | 9d27a2362bd002a04607214d90dcc07a46b1d7d9 [diff] | |
parent | 9d89f2ed0d9bc0efb1244fbe52b490aae4d5b8f7 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 972b902171 -s ours am: 9d89f2ed0d -s ours Change-Id: I799c4f71f5216acf7623e49ea9293192166bb387