| commit | c0c4e7f9a14305acecb3ca530fd1c33d837ac884 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jun 28 15:29:37 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 28 15:29:37 2017 +0000 |
| tree | 442ee71b495c6530502ed1b6b5505601010742df | |
| parent | 8a32534a1d37a67e320a1b00e9c222760832fce0 [diff] | |
| parent | ec1268b17285dce6af393a6f98d78061f9e03f62 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: f36a995424 -s ours am: 8a6ee58aa0 -s ours" into oc-dr1-dev-plus-aosp