tree b0dd5e01d0e3fdd790e6a546ce5f3b7743c260b7
parent 35200762980aa2c0f90e73e38af94fd29b50f91f
parent cf352c5d7e1482cc80be4eb2bbe99041a2345f8e
author Narayan Kamath <narayan@google.com> 1396441408 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396441408 +0000

am cf352c5d: Merge "Add warning message for java6 builds."

* commit 'cf352c5d7e1482cc80be4eb2bbe99041a2345f8e':
  Add warning message for java6 builds.