tree 1b866314542b67da88a4dd1722252d71fd5f27b4
parent 8b06d6b7c691f7cf2811420edd5f0eece97ad5ef
parent 71e5dd3055dc6a441ce20f0905f1b3893f79d27e
author Ying Wang <wangying@android.com> 1386027104 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386027104 +0000

am 71e5dd30: am 7a772619: Merge "core: support make 4.00"

* commit '71e5dd3055dc6a441ce20f0905f1b3893f79d27e':
  core: support make 4.00