| commit | 609bc28734d0097334dd64c06965c14fb853637a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 02 15:24:40 2017 -0700 |
| committer | Xin Li <delphij@google.com> | Thu Nov 02 15:24:40 2017 -0700 |
| tree | cac4d9927683b22c584428d30e4f193bc6fa9333 | |
| parent | cfdd7de171dd8c303056c62b9e9c0840ab1aa6ce [diff] | |
| parent | 5e1ea7c087a5fac80985b64d6ec19c16be1e06b1 [diff] |
Merge commit '5e1ea7c087a5fac80985b64d6ec19c16be1e06b1' from oc-mr1-dev-plus-aosp into stage-aosp-master Change-Id: I346f70872b7a0b5ecb2066299f7dc795d3364c06