| commit | 81dfe744d643e0a9b4cb6d413d18d10e0a05c515 | [log] [tgz] |
|---|---|---|
| author | Lalit Maganti <lalitm@google.com> | Thu Sep 27 16:40:44 2018 +0100 |
| committer | Lalit Maganti <lalitm@google.com> | Thu Sep 27 16:43:27 2018 +0100 |
| tree | a0e5eb92d6ee2c57110ba247bb9568e39e9dc087 | |
| parent | 81462faf058284633b0c37f3e9aff2419013ed5f [diff] | |
| parent | 0cb277ef878e9627787c2845e86abb2c99be85b7 [diff] |
resolve merge conflicts of 0cb277ef878e9627787c2845e86abb2c99be85b7 to pi-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I7c5ad527cd57659a7ae1d913580bd1f613bee9dd