OSDN Git Service

am 564abd16: (-s ours) am 0f672c6a: (-s ours) Merge "[DO NOT MERGE] Trim the AOSP...
authorYing Wang <wangying@google.com>
Fri, 20 Feb 2015 00:50:10 +0000 (00:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Feb 2015 00:50:10 +0000 (00:50 +0000)
commit56bcf675976af65353b848bcfa34d671fa65d4ed
treec431bf3998466f53873f722a24f31c5e718f6e7c
parentb6cbd561a93e47a3bd87c8fe9a828baddf0055bc
parent564abd1642fc3584a82d2737d053f9a50c5d0cae
am 564abd16: (-s ours) am 0f672c6a: (-s ours) Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION."

* commit '564abd1642fc3584a82d2737d053f9a50c5d0cae':
  [DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.