| commit | 1fd2abcf1d6404817510fa20070ef7cc6ec70854 | [log] [tgz] |
|---|---|---|
| author | Jayachandran C <jayachandranc@google.com> | Thu Nov 08 13:12:57 2018 -0800 |
| committer | Jayachandran C <jayachandranc@google.com> | Thu Nov 08 13:13:58 2018 -0800 |
| tree | 68178c51c69a991d4049e386771b3961fdda95b9 | |
| parent | 6cb15cffb62811fea9e65d1d2611ec50bdf8ead5 [diff] | |
| parent | c4555ee941073ca5f9be61133c2b836e8e1a093e [diff] |
resolve merge conflicts of c4555ee941073ca5f9be61133c2b836e8e1a093e to pi-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I897faef1bc1a32a5cf11a048b3a9dd1c40a9bc24