| commit | 6c5fc4cab537e8a150a04081f64e55ae95940245 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Mon Apr 03 23:27:49 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 03 23:27:49 2017 +0000 |
| tree | df2eac86f23cb2dab056b1972c16a6222e005a89 | |
| parent | b6ff195e4c30012fa6a7b3fe13a7938dc1c007ea [diff] | |
| parent | c088b23ae5d8cab6878e43cc37b7b5d141f6c6d7 [diff] |
resolve merge conflicts of 9ede47ea to oc-dev-plus-aosp am: c088b23ae5 Change-Id: I1ea3224c203fd8aae51e7c56a46c0701d32e6cb3