commit | 8de969186ca974d1e995231924127021dfb324a8 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 03 17:49:06 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 03 17:49:06 2016 +0000 |
tree | 2cc74d672512fac0506533395f5c337939cfa085 | |
parent | 4fa227e956dd7bdb10ec5dde2b1812e8b0a825b6 [diff] | |
parent | ca5c3cce0bbc646a3d3d883057575489dc7e7f4d [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 39884131c0 -s ours am: ca5c3cce0b -s ours * commit 'ca5c3cce0bbc646a3d3d883057575489dc7e7f4d': Change-Id: I64f79d0ee720024f27cd17d503db06bceb74bdcd