tree 8b32951d49e93bab86f18547290887fd3ba51072
parent 2697156432a99a12d6f9824964eb9419d57f3680
parent 4715ebef92688c849842c99d1bd09e3f7e225938
author Stuart Scott <stuartscott@google.com> 1383261298 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383261298 -0700

am 4715ebef: am 66e99bd7: Merge "Removing Bootup tests." into klp-dev

* commit '4715ebef92688c849842c99d1bd09e3f7e225938':
  Removing Bootup tests.