| commit | 35d17c30e1aac0685514592f9fa5173bc4a1aa9d | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon May 23 16:04:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 16:04:01 2016 +0000 |
| tree | f18b4f23760535840cf3c0410eb17d186883dd01 | |
| parent | a4228591c89eb4e356377d3994640e089db65df4 [diff] | |
| parent | bb434299c7a26abf778f76565266b0bf5e851d99 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a21 -s ours" into nyc-mr1-dev am: bb434299c7 -s ours * commit 'bb434299c7a26abf778f76565266b0bf5e851d99': Import translations. DO NOT MERGE Change-Id: I853f2818174b6c5653b7414e4a1205d5f1e910b1