| commit | 0cec17209e72639b6ac836eb8c59bba6bf481253 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Tue Jun 20 15:05:23 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 20 15:05:23 2017 +0000 |
| tree | c086e89df8ab6cf57fcdca427354a24703937151 | |
| parent | 5347490663b0c695c481a724abbfc3d90c0fa469 [diff] | |
| parent | b912c50b197cc0fc49bb7897130581dd02d2af01 [diff] |
resolve merge conflicts of 9e6b6e2a58d4 to oc-dev-plus-aosp am: b912c50b19 Change-Id: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08