am 42cc98ea: am a541aa65: resolved conflicts for 3f9d7b08 to stage-aosp-master

* commit '42cc98ea8c4396083f9bae0bd18553836f612d20':
  platform tools version: replace alpha1 with rc1
This commit is contained in:
Siva Velusamy
2015-09-15 00:28:56 +00:00
committed by Android Git Automerger

View File

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