commit | ceb47ebd47f860ba8947dfe30077485d5b391c7f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 16 10:28:49 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 16 10:28:49 2016 +0000 |
tree | f790771735108b6d54da196144150196375c4500 | |
parent | b106f235f090a4176be091c2a3c122334bc69f01 [diff] | |
parent | fa1de68f0b5d25cf9416e024b7fc846452c4510d [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 2edb44c33b -s ours am: fa1de68f0b -s ours Change-Id: Ida7e339c71d61479d813186d7f57734e8730f520