OSDN Git Service

am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version"
authorYing Wang <wangying@android.com>
Mon, 10 Mar 2014 19:29:36 +0000 (19:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Mar 2014 19:29:36 +0000 (19:29 +0000)
* commit '61cf1df7edbb9d52a6f151b011633b2859213c35':
  jdk error message should not mention the version

1  2 
core/config.mk

diff --cc core/config.mk
Simple merge