| commit | 6625b9549c7279e47833b5e474793ba0611a407f | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Jun 08 23:32:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 08 23:32:26 2017 +0000 |
| tree | 1498c73f0a4a374bc8ed53bcd67326d649630f1a | |
| parent | a7f70bed81d1e01e3ca4a2fbff9403ab0afdc345 [diff] | |
| parent | 49bd4748e39769c56067568df2860a6a5a5f6d3e [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b -s ours am: 4ec78fa17b -s ours" into oc-dr1-dev-plus-aosp am: 49bd4748e3 -s ours Change-Id: I274b4748a05360acd38c91befa705f9182c2fa40