| commit | 116b6cef23521745f86b21633f6e0e865782fda6 | [log] [tgz] |
|---|---|---|
| author | Justin Yun <justinyun@google.com> | Wed Apr 04 16:47:48 2018 +0900 |
| committer | Justin Yun <justinyun@google.com> | Wed Apr 04 16:47:48 2018 +0900 |
| tree | d04ee86d616d887f0811f6cfc48abb0f66997597 | |
| parent | fdaaeb14b1d582e2fd822ca6eeb078399b47549f [diff] | |
| parent | 594542257a0f89bd1737a1dec71e0551ebb4d5af [diff] |
resolve merge conflicts of 594542257a0f89bd1737a1dec71e0551ebb4d5af to pi-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I8a9157b9e74a767b28ba7b60d30855073db69c7a