| commit | 7c249e88b4fa56cb6bf1a482c85df58172f51b1c | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Thu May 11 13:31:13 2017 +0100 |
| committer | Adam Vartanian <flooey@google.com> | Thu May 11 13:31:18 2017 +0100 |
| tree | 8d84afcd68d1134bc57af7e2c3f7f7a525721d2d | |
| parent | a989722bae286f1db4b0aa21fc65579afeb3b720 [diff] | |
| parent | d3e20d07c394c5964f157533df0e4df2d6fae173 [diff] |
resolve merge conflicts of d3e20d07c3 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ib46c39c720c58fc84e33311148d445bb705e43cf