commit | fc4fb605979a7d6a077d0d03df4271e12ceccf20 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 21 17:02:49 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 17:02:49 2016 +0000 |
tree | 6910d17d99ad18d502812a1587bd53064260b01c | |
parent | 9cfd92d7d8eb159a27053839bbc906ad7250c187 [diff] | |
parent | 440199c6c4ca9ae12b823c2458f43a7c1753130d [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f315e2e6f0 -s ours am: 440199c6c4 -s ours Change-Id: I09f6c8d03838d659c42ef85c2a201258679346ef