| commit | 1ae7379baab4b2941ad1701190718cf53a051b48 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed Apr 12 08:56:20 2017 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Wed Apr 12 09:11:38 2017 -0700 |
| tree | 74cd60feb4b9388ff04dadbe0f933b13fce36f42 | |
| parent | 9e610d1a3be65117f478f59f3ef4c38c5295afb6 [diff] | |
| parent | 7c451a9347f39b82113d5cfae36bf4de67c5171a [diff] |
resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: 34250038 Change-Id: I4196a6d5a1365106643ac6c1548fd86faffead6f