d2: fix parsing error
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1