commit | 834ee1cd32331980b4f7627b2da70ea4fc918b47 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Sep 07 12:34:48 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 07 12:34:48 2016 +0000 |
tree | b2d70f7ef895990c70afcc288227922eba69e406 | |
parent | a7d1d4a826b757ae066cb4d2831476f3fbf42e77 [diff] | |
parent | 14f6892d4b7031585f6e11d007ca2f2a27518f20 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c906d9dc72 -s ours am: b77af8caca -s ours" into nyc-mr1-dev-plus-aosp am: 14f6892d4b -s ours Change-Id: I1754d387cbb7bc916ba08e542efb8a81b0a4492c