tree 753ca8474d297fc25229ee66e48bc9bb380b9c95
parent 533325d5ca6ec16073021f4832dcc5b5ae5c3dc6
parent c542d1141d8e54d6224295bded87c55c16bd5f8f
author Calin Juravle <calin@google.com> 1408713959 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408713959 +0000

am c542d114: am 67cfe0c0: Merge "Allow apk path to contain one subdirectory." into lmp-dev

* commit 'c542d1141d8e54d6224295bded87c55c16bd5f8f':
  Allow apk path to contain one subdirectory.