tree 93453aace51409ec982d805d1063d6c5d58070b5
parent 06c7d788ba875efae15121d3ba843d5f22137eca
parent b972321361fdd5d7cc5ee9d92b610c3aeaef6a8c
author Xin Li <delphij@google.com> 1501605335 -0700
committer Xin Li <delphij@google.com> 1501607061 -0700

DO NOT MERGE: Merge commit 'b972321361fdd5d7cc5ee9d92b610c3aeaef6a8c'
from oc-support-26.0-dev to stage-aosp-master.

Bug: 64219148
Test: build and test on aosp_bullhead-userdebug
Change-Id: I58cb0eb51929b579287e0f3f693fe9d9f7636ab7