commit | c5432f8807878dd28df63d562132afc2f8ec9da0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 16 10:30:01 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 16 10:30:01 2016 +0000 |
tree | d07e1c7aafdbb0ecc07ae56b288a3f64a05e92e2 | |
parent | 741cea0d89b1234d26649ec2207b2122c1f626a3 [diff] | |
parent | cf0bd1675cff5967094736522306c816ef4a5280 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76 -s ours am: cf0bd1675c -s ours Change-Id: Ie9feffc019d1b9c6ae956596c3f1a367700ee39d