tree 17b12998295c1f74feacdd55f36bc3856032dfaa
parent 2357cdb6f43d27b0e86d14b8073dc77431192cb3
parent 34c7705205f1f551fd6c3a4baee065f467a2011d
author Xin Li <delphij@google.com> 1501795942 +0000
committer android-build-merger <android-build-merger@google.com> 1501795942 +0000

DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from merge-oc-support-26.0-dev to stage-aosp-master. am: 915f756d47  -s ours am: 204e9aac8f  -s ours am: 74de8ccdf6  -s ours am: adeb6f14de  -s ours
am: 34c7705205

Change-Id: I92c7210410c4c8a46f58ff15acfeaf5a4b450e01