commit | cbdecf95fd1dbc61e55b9e39b3c39fd68c3ad8f4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jul 12 16:38:11 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 12 16:38:11 2016 +0000 |
tree | 91e17e014c1eea8130a2ab018470c09fe3753e2d | |
parent | 61d0e73419f7686b47b037deaa849518ecbc31f5 [diff] | |
parent | f25fae7ea516b7812eb788c23963cd98c3565539 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 84c67fa304 -s ours am: f25fae7ea5 -s ours Change-Id: I83d520d76aa9e4a285fc8b67cb14f7cb4e107fd6