| commit | c470adf056bfbbff1d1231ec40b9608320378c3b | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Aug 16 19:28:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 16 19:28:57 2017 +0000 |
| tree | 1a4e570f95188a6147ea8b6571d7ff6bab060dec | |
| parent | b5c5b9d36c465ed624dd4846673819f9abb67c61 [diff] | |
| parent | efdc17e95a8128c68a9bc0641c05351ae1c6f86c [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: b3f67e12be -s ours" into oc-mr1-dev-plus-aosp am: efdc17e95a -s ours Change-Id: I584152d0ff8066ed40a3ce964efef036a79fffb8