| commit | 8d391c858092e12e500298ad0c588a9d49ad55f9 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Wed Nov 07 15:17:30 2018 -0800 |
| committer | Shuo Qian <shuoq@google.com> | Wed Nov 07 23:55:06 2018 +0000 |
| tree | b04cbe7ae61f254ea92feaedec9ebf8f3bcf2022 | |
| parent | 575e267a23c079168a18b78c3a617e22c4e67345 [diff] | |
| parent | 61444e09ff46c30f6728954323765562eb6fd0cf [diff] |
resolve merge conflicts of 61444e09ff46c30f6728954323765562eb6fd0cf to pi-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: 109809543 Change-Id: If49f6adecb3cae911ba758753679565f9f5d317b Merged-In: I9f750a72edfc282c80f7547647bcddaf2da51d9b