tree b937e3a4d97bbd95aacaddaa5b2fbeddad5ef642
parent 157e6ac39742fb5513660e3340fc03ac0196b39a
parent 587cdcfbad39f38bdd25c267eeae01202a52f29d
author Xin Li <delphij@google.com> 1509650090 -0700
committer Xin Li <delphij@google.com> 1509650090 -0700

Merge commit '587cdcfbad39f38bdd25c267eeae01202a52f29d' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: I89320e7eb1150de3a1f95fd5cf246f3db6cb83d7