| commit | 6de282531bc892699ad86cd7f9c5496450522826 | [log] [tgz] |
|---|---|---|
| author | Cassie <xih@google.com> | Tue May 15 20:54:23 2018 -0700 |
| committer | Cassie <xih@google.com> | Tue May 15 20:54:23 2018 -0700 |
| tree | 4227fe880ace0334bc02884333a6af55b205a6d4 | |
| parent | 0c8fabca0f25c4f0afe915c3457665ed69788f54 [diff] | |
| parent | 363fe5d6f2f66187146275d922cbcb30a4bef436 [diff] |
resolve merge conflicts of 363fe5d6f2f66187146275d922cbcb30a4bef436 to pi-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I9f19adb233321d20a0cbadf8f94238708ec01652