tree c49ff0ffba2e6e00ac5032f59ae0df07bba110d9
parent 7d0922e2b86238c7d8778a62ccead1e55f8f0782
parent 9cd799e8fee57b94ee4124c0cc15d564c16e718e
author Nicholas Sauer <nicksauer@google.com> 1423511154 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423511154 +0000

am 9cd799e8: am fca7c4fe: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into lmp-mr1-dev

* commit '9cd799e8fee57b94ee4124c0cc15d564c16e718e':
  Update Android CTS bandaid urls that use test_key1 to a new key