tree 93453aace51409ec982d805d1063d6c5d58070b5
parent b972321361fdd5d7cc5ee9d92b610c3aeaef6a8c
parent 3b9144a101b9a8f58ed94ee928317f2f85677a0c
author Xin Li <delphij@google.com> 1501613676 +0000
committer android-build-merger <android-build-merger@google.com> 1501613676 +0000

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

Change-Id: Iebb53cecf53ac05745fc056f2ec6077d8fc03428