tree ff586886866c1179d438357ddf28a75311e4cf9b
parent 448ed20b745995db7eb53a320aa4c4ee824baec6
parent 149b73a246cc45fdfa5fec9bc51553f6c631d346
author Vinod Krishnan <vinodkrishnan@google.com> 1402019771 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402019771 +0000

am 149b73a2: am 4fed4153: Merge "Small change to CTS" into klp-modular-dev

* commit '149b73a246cc45fdfa5fec9bc51553f6c631d346':
  Small change to CTS