| commit | 14eafafaeed295c1ab57b3dec47cc412a97156f4 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Jul 06 04:10:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 06 04:10:07 2016 +0000 |
| tree | be6ede8124d519cb48a5944940cb0fac281034f4 | |
| parent | 0bf1ee474de918f5b0e3489ada97ef2ad2a5860e [diff] | |
| parent | eec3e1a549ce5b7349f02afe82a43768bce96606 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 5303849195 -s ours am: eec3e1a549 -s ours Change-Id: Ie1385345dd4b66f86b27db3a5273e11ec1712f69