tree e04840054e72b31ea698d3c6370ad9b3f5d2569c
parent 5fb88bbca53282fe6e809593204560207ebf6da7
parent 56bcf675976af65353b848bcfa34d671fa65d4ed
author Ying Wang <wangying@google.com> 1424393809 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424393809 +0000

am 56bcf675: (-s ours) am 564abd16: (-s ours) am 0f672c6a: (-s ours) Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION."

* commit '56bcf675976af65353b848bcfa34d671fa65d4ed':
  [DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.