commit | 1f914332aa056c6902d3f8dda7025422ed38958b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 03 18:32:27 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 03 18:32:27 2016 +0000 |
tree | 2f683b303b48022502f9ef6d49396b55f2264ba8 | |
parent | f21ed271f60183c55290b6a82d1ad60a8ed6228c [diff] | |
parent | cc44ccf2f9e74d6c6138ee4b40ebffecfafde1cf [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours am: cc44ccf2f9 -s ours * commit 'cc44ccf2f9e74d6c6138ee4b40ebffecfafde1cf': Change-Id: I396bbeaa1a0ead5999e96991cdc7471ab0cd283d