| commit | 78128395e7795da8f4c14b41163e6d7e2a177f5d | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Tue Dec 04 10:51:01 2018 -0800 |
| committer | Hall Liu <hallliu@google.com> | Tue Dec 04 18:55:18 2018 +0000 |
| tree | d9ca9750f8535017e991c7dbd7b1b319891e053d | |
| parent | 214fd845f5bec9a551eced0ac52b93788df7b927 [diff] | |
| parent | 57a6375a99efc61365fc7517a8bfd0f0ebbcf717 [diff] |
resolve merge conflicts of 57a6375a99efc61365fc7517a8bfd0f0ebbcf717 to pi-dev-plus-aosp Bug: 119675160 Test: None Change-Id: Ib01e4549beca4fc237b7ea95aa9043536e1e1139