tree 83a1c3518f924d2d359bc38ed3ee011a7083c85b
parent d91e4545b507fce6f7986a30b578a7b8710a1f05
parent 56a52909977778d98b23e7540512afb393870137
author Ricardo Cerqueira <cyanogenmod@cerqueira.org> 1374787154 +0100
committer Ricardo Cerqueira <cyanogenmod@cerqueira.org> 1374787259 +0100

Merge branch 'cm-10.2' into cm-10.2

Change-Id: I50f68aa709340d2be3131dac1f2d22ec0230a119