tree 2167dc1cedc9f0bc0bd1abfc5c5c0a16be25dd8a
parent f7fdf8ace4cb9f5bb331a7e8f87a57ba6181918f
parent 0dd5d9d93bda6f9fd30f2fe58e99812bc195a813
author Alexandra Gherghina <alexgherghina@google.com> 1422982202 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422982202 +0000

am 0dd5d9d9: Merge "Extend CTSVerifier tests to test for badges" into lmp-sprout-dev

* commit '0dd5d9d93bda6f9fd30f2fe58e99812bc195a813':
  Extend CTSVerifier tests to test for badges