resolved conflicts for merge of d2819621 to honeycomb-plus-aosp
Change-Id: I2c84ffb40bd1db769b9ce271206c3b680a4e3179
This commit is contained in:
@@ -1,2 +1,2 @@
|
|||||||
Pkg.UserSrc=false
|
Pkg.UserSrc=false
|
||||||
Pkg.Revision=6
|
Pkg.Revision=8
|
||||||
Reference in New Issue
Block a user