tree dbb7df2db128491b31d5400c06ca1b432eb51f18
parent 33089c090b6616d06da46e8b5ac127abc84920de
parent 9dd289529d4e4fa04e9aa66d44d6af50d9c6b149
author Daniel Sandler <dsandler@android.com> 1496790053 +0000
committer android-build-merger <android-build-merger@google.com> 1496790053 +0000

Merge "resolve merge conflicts of be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus-aosp
am: 9dd289529d

Change-Id: Ic2151c9a6a4f8ff1d76effa5b935ffa3e43bb0d8