| commit | 0c8fabca0f25c4f0afe915c3457665ed69788f54 | [log] [tgz] |
|---|---|---|
| author | Cassie <xih@google.com> | Tue May 15 14:11:12 2018 -0700 |
| committer | Cassie <xih@google.com> | Tue May 15 14:15:12 2018 -0700 |
| tree | a234875c5ec19ab4ea92d862cb8b21b896095857 | |
| parent | f237fe8fd4c0b935f820c3edc196e04d8e26a072 [diff] | |
| parent | 9365e0eab75d944c8636132d107c758537f25597 [diff] |
resolve merge conflicts of 9365e0eab75d944c8636132d107c758537f25597 to pi-dev-plus-aosp BUG: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Iacddcc9c6ada32e224c8cd153ea5d4a344f64f41