tree b937e3a4d97bbd95aacaddaa5b2fbeddad5ef642
parent 73e6f511cce54c1a776d1716a803c50920edec37
parent c4357ca99f64aec4e4200f44d47a41e130b012e9
author Xin Li <delphij@google.com> 1509982362 +0000
committer android-build-merger <android-build-merger@google.com> 1509982362 +0000

Merge commit '587cdcfbad39f38bdd25c267eeae01202a52f29d' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master am: 3c11dd99cf
am: c4357ca99f

Change-Id: Id9044920fc3ccbf5a0a0e2d8072ca1ba285fbc35