commit | c5008ed2dd2d18902e39033248847b1e5a319c07 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Oct 17 23:20:33 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 17 23:20:33 2017 +0000 |
tree | 6ffbce52e5193e51fae6990f16b9194d3f44f418 | |
parent | 65ce1cf7db21a716cc6445a862eabc833d30749b [diff] | |
parent | eea1d23669a7725b45e3a966f51d0f28ddcd86fd [diff] |
Merge commit '97160a161f8eeb38018cd735a6adb64c4cebd375' from oc-dev into stage-aosp-master am: eea1d23669 Change-Id: I9dd9744767029b6815c28d1d45ae50aa5e4c23b8