tree 1ab854d27614035bbdd8470f5c89ca05c7c89526
parent 492e72f2f6f94372565fd7ea53c97924188d7d1a
parent 08ebf8fccfb233f8f0382a0440ef61e353054ef6
author Unsuk Jung <unsuk@google.com> 1421366694 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421366694 +0000

am 08ebf8fc: (-s ours) am 5ec4699a: DO NOT MERGE - bump CTS version to CTS 5.1_r0.5

* commit '08ebf8fccfb233f8f0382a0440ef61e353054ef6':
  DO NOT MERGE - bump CTS version to CTS 5.1_r0.5