commit | 3fa5c2b1a8a1f3d39172e683b540c03f452469e4 | [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 | 7c4f6e54c7694a8280ca0e2ce90dc0eb76a66f8e | |
parent | 703eca1a5d5a6f64451f65b24a94412ede453fdc [diff] | |
parent | e0464277a3191507c6c9031c27765b27c3d7c584 [diff] |
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master. Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7 Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d