| commit | e17c94c7b4157884cb6caf4393c2299241851baf | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 02 12:09:32 2017 -0700 |
| committer | Xin Li <delphij@google.com> | Thu Nov 02 12:09:32 2017 -0700 |
| tree | 91cbafe616517d669aa153641bf232fb76f10de6 | |
| parent | 4b41afb95a920fbb7c3217a9a7700b9bbc6b1fd8 [diff] | |
| parent | 513dfe9fd0e341635bdca483a3ec6dac5f4c58ad [diff] |
Merge commit '513dfe9fd0e341635bdca483a3ec6dac5f4c58ad' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master Change-Id: I9f07d8d3de4fbb4138e49a212d22b0a1de949dda