tree d045ff1202b3f1dd05ee219397d618f5c5cf96e6
parent cd41f0fe06e3dc4a173714103b068610abdafc89
parent 88bb68148bd0510a1564d673421f051011b4240c
author Chris Craik <ccraik@google.com> 1496778386 +0000
committer android-build-merger <android-build-merger@google.com> 1496778386 +0000

resolve merge conflicts of 3dd3a1ed to oc-dev-plus-aosp
am: 88bb68148b  -s ours

Change-Id: Ia01e3a737ad6af93a3549b9db4703b629cde34e2