| commit | d05c395b2628538b98229c2a09df2d7fbd2d7f0c | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Jun 13 02:59:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 13 02:59:10 2017 +0000 |
| tree | 45522cce935f3a9053b1634660d1803b551cc2e6 | |
| parent | 8819941254585e91a6fd430e135597cefc48a930 [diff] | |
| parent | 7729edee10854f5a6113c7aff4ba75f2c76b7a64 [diff] |
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a -s ours" into oc-dr1-dev am: 2eb4ec0e72 -s ours" into oc-dr1-dev-plus-aosp am: 7729edee10 -s ours Change-Id: If4afa0cf25e4c83097ffebb80fae620865f9e6e4