commit | c4357ca99f64aec4e4200f44d47a41e130b012e9 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Nov 06 15:30:42 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 06 15:30:42 2017 +0000 |
tree | b937e3a4d97bbd95aacaddaa5b2fbeddad5ef642 | |
parent | b148a6d572f520402901571d3925c405b7ca0508 [diff] | |
parent | 3c11dd99cf8dd5e931e42e7a8068cd27e5e651f2 [diff] |
Merge commit '587cdcfbad39f38bdd25c267eeae01202a52f29d' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master am: 3c11dd99cf Change-Id: I0f024dfa3ae7ddfa1d322c6969b2a195628efac0