tree ea910bcfdeea2a19a4cccd8f84c6fdfbb100c26a
parent 9005c3ac892bcf6ce170382fda82eb7698741367
parent 32ffe709ae68e7d0f55324c482c9a40d8180c1b7
author Daniel Xie <dxie@google.com> 1445558732 +0000
committer android-build-merger <android-build-merger@google.com> 1445558732 +0000

Merge "DO NOT MERGE Add running time hints to CTS package config" into marshmallow-cts-dev
am: 32ffe709ae  -s ours

* commit '32ffe709ae68e7d0f55324c482c9a40d8180c1b7':
  DO NOT MERGE Add running time hints to CTS package config