| commit | 220871a697290529278ed16db508eda8e12f3fc7 | [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 | bc13101b63c6fe39a9d92706ecb7ded7f98f5a9c | |
| parent | 802f191b2b84a1b1b82c7f6f3268846084b35dfb [diff] | |
| parent | 98e12851336b7db16e583f9afac63ecc97465980 [diff] |
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master. Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7 Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d