| commit | efc275ad84c1b00df14cfe5ddb3849b1fa05a2d7 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Tue Nov 14 11:34:06 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 14 11:34:06 2017 +0000 |
| tree | 10c7300d4b0c48a955bd75673e74239d93e5e381 | |
| parent | 6a0ccf57700267b4042d3ea46ac0c9c0645658cc [diff] | |
| parent | 75b8428b4c36a2c1278efc587c56c0f07f959fd1 [diff] |
Merge "resolve merge conflicts of 32ba3eaa to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp am: 75b8428b4c -s ours Change-Id: I04c8a21f61dd8e5a80dd8a31d51d4797a892fcd1