tree a74c426192229ea47d286e5948e4168296be8a28
parent d564792383b4b8c243e1b63ecb0c7de02aead3b7
parent 43f1befac23564fc26c9329ce4e56d32f03dfab9
author Julia Reynolds <juliacr@google.com> 1446666289 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1446666289 +0000

Merge changes I49660236,I56a7970a

* changes:
  Delete unused code.
  Unhide setting for CTS testing.