| commit | a4c154a29f67e4b885d871172784d97f6fcfa32a | [log] [tgz] |
|---|---|---|
| author | Suren Baghdasaryan <surenb@google.com> | Tue Apr 17 10:38:06 2018 -0700 |
| committer | Suren Baghdasaryan <surenb@google.com> | Tue Apr 17 10:38:06 2018 -0700 |
| tree | aa3b9610a65261c0148074dbafe11beec1d13480 | |
| parent | 556dba216c49029b86d1fe12f0e1a3fc5876b4c7 [diff] | |
| parent | 57e5b82dff25b27d235d8076d3b8d1a28bb7c45e [diff] |
resolve merge conflicts of 885ff611d73db3ebf62dbbba5ec331836721bde1 to pi-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I0dfd3b1424c106437acbd68059d14ca5b0146a8d