commit | b229ff42198cda2e88d7a3574fc90cded31350ec | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 03 17:03:01 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 03 17:03:01 2016 +0000 |
tree | c0c89057b39fb5fd786b6c851ce2e7d9040a54c5 | |
parent | 3c6e2b7cd9e747316c47aa5b93cb84b416876938 [diff] | |
parent | 262e63532e87e7ae6d1c070f9e7a321b24795a09 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 39884131c0 -s ours am: c8b42d6674 -s ours am: 262e63532e -s ours * commit '262e63532e87e7ae6d1c070f9e7a321b24795a09': Import translations. DO NOT MERGE Change-Id: Ie9860890e436085f41b39a48801f726e981fa796