| commit | 0497f43e807a9052da9b70a415be30ea10c3cb98 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Aug 24 16:41:17 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 24 16:41:17 2017 +0000 |
| tree | d7e3306190162f388f77ffd1a71ee3e53c7b4013 | |
| parent | 8c169398f36de01cefa4e6d853711cc5da07afcc [diff] | |
| parent | c25cc796dab24c8eb98295bda87a652eb4714dc4 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7175b7b929 -s ours am: 1c1e7095f3 -s ours" into oc-mr1-dev-plus-aosp