tree cdccbebe9dc64f35ca402887f28dfd1c33c0adfc
parent 4d1fc3a23cfb77b29a279764c1a486887e987d25
parent be983a2e35450b5402001d3d777815250e04e14f
author Daniel Xie <dxie@google.com> 1445559761 +0000
committer android-build-merger <android-build-merger@google.com> 1445559761 +0000

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

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