tree a934a030f37be2ddd274601cfd4f227931b20a49
parent 6f6f159dbe4747eeeea97835f2a3fe3899886f7c
parent 33d48abe37ca532779561a6f7aeef2120e00d663
author Narayan Kamath <narayan@google.com> 1509546388 +0000
committer android-build-merger <android-build-merger@google.com> 1509546388 +0000

resolve merge conflicts of a0f796f20 to oc-mr1-dev-plus-aosp
am: 33d48abe37

Change-Id: I5d027f478fe7d2cce9ef17e487a37abaa640d12c