commit | 9d5b5ad34eeaf4c8f16eff44750db1dd3025d6af | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Jun 08 13:43:17 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 08 13:43:17 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | 43fcd4524828542f46b24c1696fdc5eb75ef7cdd [diff] | |
parent | 2330bda48b2578d50682dda416c0902e1bf92730 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: dbfd3a837e -s ours am: 2330bda48b -s ours Change-Id: I5894a3e637e0150df1117ab1959154afe58c024c