| commit | 4b2604d3d17672e713192fc0e48c036e1794e094 | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Tue Jan 15 15:55:17 2019 -0800 |
| committer | Brad Ebinger <breadley@google.com> | Wed Jan 16 00:11:38 2019 +0000 |
| tree | f1f7145275d58f3370c1b8577c726349cbb0530f | |
| parent | d83144070c3f6a2472d858714f955398aa894bb3 [diff] | |
| parent | 17c69f541495e4f291124b698bbc24636bf8eac2 [diff] |
resolve merge conflicts of 17c69f541495e4f291124b698bbc24636bf8eac2 to pi-dev-plus-aosp Bug: 120986348 Bug: 120945804 Test: Treehugger Merged-In: I4d7a203dd57050535867329c8dc36f8c75667c15 Change-Id: Ia2378265df93dd6b605b1b4af53e415c6ded1faf