tree e0ddd87bd9d323d7987194bcb89c8277d7aecf55
parent 27a24d06af6e1fc0931acd48b4b992e2f0f30f61
parent 9eb066973fdf6c48ccd3fbb80e37bc21ba7bf20b
author Xin Li <delphij@google.com> 1510189691 +0000
committer android-build-merger <android-build-merger@google.com> 1510189691 +0000

resolve merge conflicts of 01270df to oc-mr1-dev-plus-aosp
am: 9eb066973f

Change-Id: I1fd068e9f996ab44a6e1a9fc334b45d77f56d5e8