commit | 5ac71fee2335e5b296854837707610bbf1c68f98 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 21 03:42:18 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 21 03:42:18 2016 +0000 |
tree | b3348af0e2af1937f4ec317971714c153f9836df | |
parent | 0a94845a7e7567132e09f6314ba96a96b0dbf2ab [diff] | |
parent | 09af2a1032661dc85335d8365c1e79bf7257f333 [diff] |
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am: 09af2a1032 -s ours Change-Id: Iacb267f7fb77bc555cbd537df6471f0b9c7a0007