| commit | 1eee5bdc164119c49405c7c7fa51147136a16dc7 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Feb 13 19:08:17 2017 -0800 |
| committer | Colin Cross <ccross@android.com> | Mon Feb 13 19:08:17 2017 -0800 |
| tree | 9255d5d60651251b1e94b0a976fa7f0bf2bedc8d | |
| parent | 297bc8ebb9448f215696e301cc6cb836038a3391 [diff] |
Fix broken build I84433729448f32fc1eea4d93bc9ad6b99252608b broke the build due to an incorrect Merged-in line containing an extra "CHANGE-ID", which caused the automerger to merge it and hit an unlucky double merge of a hunk. Undo the double merge to fix the build. Test: mma -j Change-Id: I08a164b1653265d2ec3292dafa452cbc2130672c