tree 6f0c1c3f955dbcd9045b589863fd3b4b8453e42e
parent 4e934043ed1e9a991f948b9764972acdd37a8d6d
parent 1ae7379baab4b2941ad1701190718cf53a051b48
author Mark Salyzyn <salyzyn@google.com> 1492014512 +0000
committer android-build-merger <android-build-merger@google.com> 1492014512 +0000

resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp
am: 1ae7379baa

Change-Id: Id715cb96a71fc9e48e14ff2e6f9e4883402aa6f6