| commit | aa68114d8b0ec92477190ef487c0bb631cf13c3b | [log] [tgz] |
|---|---|---|
| author | Shaotang Li <shaotangli@google.com> | Thu Aug 30 18:35:38 2018 +0800 |
| committer | Shaotang Li <shaotangli@google.com> | Thu Aug 30 10:39:15 2018 +0000 |
| tree | f9edf0eb5fc643a5301d798db28402b839fd83ec | |
| parent | 76dcc6b4707e1fb7c3beb90971009c106c5de68d [diff] | |
| parent | 882f4e1f444194405ef78a3a9d5c1618cb8a8013 [diff] |
resolve merge conflicts of 882f4e1f444194405ef78a3a9d5c1618cb8a8013 to pi-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I4d0c3c9420e5c7af697be74521040040284a2299 Merged-In: I2eb6965238e37435bb380fb4a0e616bd1da6dae6