tree 45d4149ab646006a678e837c731ba3168ee00b83
parent f6b165e0232c315d91c3ba2c394da27234012fd9
parent 15b2b0f711a824f4e4e8b72584b1fb8d19b3f123
author Keun young Park <keunyoung@google.com> 1343944597 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343944597 -0700

am 15b2b0f7: Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev

* commit '15b2b0f711a824f4e4e8b72584b1fb8d19b3f123':
  keep PLATFORM_ZIP specified explicitly