| commit | 22f140d66305760076ab34626eb093a6eb3f6f04 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Jun 08 23:25:19 2018 -0700 |
| committer | Xin Li <delphij@google.com> | Fri Jun 08 23:25:19 2018 -0700 |
| tree | 84b80d9ab3f43650df29a07cb3c24065e37c1e7f | |
| parent | d938b65f8a7645644faa233d299546111dd1c82d [diff] | |
| parent | f11e2bd016d886a333345dea853ebda23a408d5c [diff] |
resolve merge conflicts of f11e2bd016d886a333345dea853ebda23a408d5c to pi-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I4966411ed2eb3f4e29726a29069c1cd66a4becff