| commit | 5232d6d927d9d76760bcce5a03171ec574f50ff4 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Apr 21 01:55:08 2017 +0000 |
| committer | Steven Moreland <smoreland@google.com> | Fri Apr 21 01:55:08 2017 +0000 |
| tree | 72f479599d89b7472dcf5b7fb56328d87f7cf61f | |
| parent | 40d89431dbad9c7f5820ddbe21dd8a532f58f0f5 [diff] |
Revert "resolve merge conflicts of 03e80b462 to oc-dev-plus-aosp" This reverts commit 40d89431dbad9c7f5820ddbe21dd8a532f58f0f5. Reason for revert: didn't delete mk Change-Id: Ib3a3f249c278be582de04a583e18de3c0e502d5e