| commit | b8d81aed6c622dcfa0dad1ef69b4660d9350283d | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Nov 14 11:47:59 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Tue Nov 14 11:47:59 2017 -0800 |
| tree | eb17f56b5a6585567476011b623f1ad06900c233 | |
| parent | e499792706ec5342e8575ba405de7133c873698f [diff] | |
| parent | 514a23836bc263e729c89b4c1ec60912a7cb6765 [diff] |
Merge commit '514a23836bc263e729c89b4c1ec60912a7cb6765' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master Change-Id: I9c96b666efe553d2bc51fca5b9ca5d29c45be083