tree 4f5d0782f5c66572669fdabf78d57b1c6e827a73
parent ea26b27187b2949c99cea58c531ea99937c549eb
parent 8293de011c8e14383ea20a25d6375f5b037995b2
author Ying Wang <wangying@google.com> 1422553773 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422553773 +0000

am 8293de01: Merge "Generate CTS files when running mmma." into lmp-mr1-dev

* commit '8293de011c8e14383ea20a25d6375f5b037995b2':
  Generate CTS files when running mmma.