OSDN Git Service

am 81fc969b: am cf352c5d: Merge "Add warning message for java6 builds."
authorNarayan Kamath <narayan@google.com>
Wed, 2 Apr 2014 12:26:38 +0000 (12:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Apr 2014 12:26:38 +0000 (12:26 +0000)
* commit '81fc969b65fb4cc7dc9f5698aa8c37c657f853ef':
  Add warning message for java6 builds.

1  2 
core/main.mk

diff --cc core/main.mk
Simple merge