| commit | 47beb1e8a3478538ce1ba478ace9b0691411fe59 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Nov 14 12:31:11 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Tue Nov 14 12:31:11 2017 -0800 |
| tree | 696313ef4b10e3834a8937c382c4e5040624de1b | |
| parent | 28dc8a29a1d0b6d0e0a4d2a9e7cdea1e49a450ef [diff] | |
| parent | 2b71ef1fe229cb9c82828623e4422402974f9e70 [diff] |
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master. Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7 Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d