resolved conflicts for b1ead6e2 to stage-aosp-master

Change-Id: I86c4af2fece33e94cf7fd8f3301f05a3fcdb642e
This commit is contained in:
Siva Velusamy
2015-09-14 11:56:51 -07:00

View File

@@ -1,2 +1,2 @@
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0 Pkg.Revision=${PLATFORM_SDK_VERSION}.1.0 alpha1