| commit | b36612583b53a35b0445e69999831a123365dc31 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jul 01 05:11:00 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 05:11:00 2016 +0000 |
| tree | 88de3ea9a1da0d30f0fb77023649e7c348d31e6c | |
| parent | 499e80d80aa00a02a4703c093056b0be527b7309 [diff] | |
| parent | 1ff708930b2263238abc00a8ad0f39e9d73baf22 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: baedc65a8b -s ours am: 273eac9b75 -s ours Change-Id: I8dd4427627c41546e1fdb36cbfff2db7798766c7