| commit | 8a407d1037ddea85a688122a63a7df5fb85b9200 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Jun 16 10:09:09 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 16 10:09:09 2016 +0000 |
| tree | f600a700a723368b495094007267a629368cef8f | |
| parent | 5a49e9c9237771896796149d75d3b78a77a554b5 [diff] | |
| parent | 74ab23803ce5ca12e684ebd410dd039d91e6b261 [diff] |
Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2 -s ours\" into nyc-mr1-dev am: 74ab23803c -s ours Change-Id: I548d5434c7fcaf9e7d5588f948f7fda21d96c473