| commit | 009a4f0191e5e93d3494c51d39e4590cabb3d75c | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri May 05 12:15:43 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 05 12:15:43 2017 +0000 |
| tree | 137c5404f41fa14353650c27b8db0883e71c93a6 | |
| parent | 305c9d2846dc7cfcce5827b74d144facdb5e12fd [diff] | |
| parent | 84bb0ecd1dff028ab0900ca44d86989ca3d65782 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 8d95e04111 -s ours" into oc-dev-plus-aosp am: 84bb0ecd1d -s ours Change-Id: Ic85fab2a3da0445db3c6e6c754ac8d607b633e49