| commit | f73567e4a2a077e722f52ced7eef445a9f8f27d2 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Fri May 25 15:13:40 2018 -0700 |
| committer | Jesse Hall <jessehall@google.com> | Fri May 25 15:13:46 2018 -0700 |
| tree | 10620533c84db0f359d2f4b386c92496dbdd27b3 | |
| parent | f86fe80b687a0e70c8c961099f56085345fc5786 [diff] | |
| parent | 6f7ca9f1672a8182fb5f9293ce89daac463299dd [diff] |
resolve merge conflicts of 6f7ca9f1672a8182fb5f9293ce89daac463299dd to pi-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: If6ca4ce2c5ab19f4cb077e00d91ff20f0533568d Merged-In: Ida58adb0f0057485d3768b959697b4d583abd80b