tree b3016482e37554c1b14fd4426e4b21f03b1ec4a0
parent c5ce6b1d05ca40ba74deba30510badfa76eaa287
parent 7020e0688c7968192d5f605305db8c383a9f949f
author Trevor Johns <trevorjohns@google.com> 1425923550 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425923550 +0000

am 7020e068: Merge "Refactor basebuild / allow apps without Application module" into lmp-docs

* commit '7020e0688c7968192d5f605305db8c383a9f949f':
  Refactor basebuild / allow apps without Application module