tree b54274f5b2bf5188daeb9d5da4e13828847f06b8
parent 5aca0469a7f104500ca848fbd84d735c6a8e4158
parent cc3da80ac483ae660d177aa4955b4f78bf1288ba
author Xin Li <delphij@google.com> 1501613437 +0000
committer android-build-merger <android-build-merger@google.com> 1501613437 +0000

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

Change-Id: Icb4d7e2658bc90585c89c923ffd2ca61327f03e7