tree 14a864b72118bcdc0eb172905e06d531fc5d8140
parent 48577018ea348bd18d4eaa2f5501efd9ad4dbb29
parent f843f79775309d7563d40c1982dfbaab42c79d8c
author Robert Ly <robertly@google.com> 1403656159 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403656159 +0000

am f843f797: am 2d50cda2: Merge "docs: Noted that ADT require Java 7 for L dev preview." into klp-modular-dev

* commit 'f843f79775309d7563d40c1982dfbaab42c79d8c':
  docs: Noted that ADT require Java 7 for L dev preview.