| commit | 8ed24ceef30dd0bb92d6477b0eaa10367749068c | [log] [tgz] |
|---|---|---|
| author | Yi Kong <yikong@google.com> | Fri Jun 08 17:15:29 2018 -0700 |
| committer | Xin Li <delphij@google.com> | Sat Jun 09 00:28:15 2018 +0000 |
| tree | 4c23a50d04f51119a0ebb37e0a6e907df6e5c89d | |
| parent | f11e2bd016d886a333345dea853ebda23a408d5c [diff] |
resolve merge conflicts of aabd6b7fa343654cd85b3b2da392e424d037d15a to pi-dev-plus-aosp BUG: None Test: m checkbuild Change-Id: Iaea1d2481a1ef0e5b1d5ae404168fb42ed923d61 Merged-In: I3181bc5683796423a98b0f9b94daf30880c07bdc