tree 109b1f376bf65952c14d9165014d005a03493c8b
parent 7ccfe203a789187ccb596b14250ccc3e92626e1d
parent a273d525b1038dda6d8040a3d016346f4c961f73
author Nicholas Sauer <nicksauer@google.com> 1417639320 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417639320 +0000

am a273d525: Merge "Fix CTS - Test plans not generated." into lmp-mr1-dev

* commit 'a273d525b1038dda6d8040a3d016346f4c961f73':
  Fix CTS - Test plans not generated.