| commit | 351e4e3a13320166d31b8030547136977d37268c | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 09 16:29:41 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 09 16:29:41 2017 +0000 |
| tree | 3ffe01bf3ae29b64135046a72c35a77f9f08a63e | |
| parent | b4b2fe7948ee02a96a218c40c6a7522b0165b692 [diff] | |
| parent | 425a95877061fad21c05d61ccc2c9f753edcdcb3 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 728c610446 -s ours am: b059f0bc3d -s ours" into oc-dr1-dev-plus-aosp am: 425a958770 -s ours Change-Id: I11040add74c0145a8ff1cda297d6292387692169