| commit | 3862dd36855571c4b087103c885140289f6d82d1 | [log] [tgz] |
|---|---|---|
| author | Suren Baghdasaryan <surenb@google.com> | Mon May 21 19:48:47 2018 -0700 |
| committer | Suren Baghdasaryan <surenb@google.com> | Mon May 21 19:48:47 2018 -0700 |
| tree | 89499475376c01ab8e09e3e5c61ab0a4df777bb6 | |
| parent | fead00c7d81c54dab9af833a6d7b2897796fa7dd [diff] | |
| parent | 20686f061eebddb7d49d9a061fc736dad0b96c93 [diff] |
resolve merge conflicts of 20686f061eebddb7d49d9a061fc736dad0b96c93 to pi-dev-plus-aosp BUG: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I02b5973366351604bf46df7ad4e2235b1dda014a