tree d0d118271a6091edf76d9d72d4c25a8e660ea19d
parent 0a69ce6cf60f1e9cc5f50a192478d6e898d4fdaa
parent 82fa124c3a2753ce70c04973d8004b2b1950993d
author Vinod Krishnan <vinodkrishnan@google.com> 1400695837 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400695837 +0000

am 82fa124c: am 4f65a545: Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev

* commit '82fa124c3a2753ce70c04973d8004b2b1950993d':
  Adding more DeviceDefault for CTS tests