| commit | 1b69cfe433646eaefc57c4fbaeea07720aafec1a | [log] [tgz] |
|---|---|---|
| author | Dimitry Ivanov <dimitry@google.com> | Thu May 25 18:48:01 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 25 18:48:01 2017 +0000 |
| tree | 6ac3bfbdb85a6536f2ea66b2e2df5edf4e5ccfdc | |
| parent | 99f28f61c2f4ccc415c0748594f8f0bbd67fa114 [diff] | |
| parent | 0a9042fadbdd7e6bec8fc83d6d8ce5095e09f735 [diff] |
Merge "resolve merge conflicts of bb958f0f5 to oc-dev-plus-aosp" into oc-dev-plus-aosp am: 0a9042fadb Change-Id: Ibfc295fc6fb0ce881ac3826899d3e332e9cd6c4c