tree 6701930e32abade13114d385e75b22e39f457c0c
parent 46785aea64ec443eac8545ad08c8638f2ca57884
parent 878775fd750d7164bd0920b4b94b59e0edab8ed3
author Todd Kennedy <toddke@google.com> 1462234135 +0000
committer android-build-merger <android-build-merger@google.com> 1462234135 +0000

Merge "Revert "Add shim app for CTS testing"" into nyc-dev
am: 878775fd75

* commit '878775fd750d7164bd0920b4b94b59e0edab8ed3':
  Revert "Add shim app for CTS testing"

Change-Id: Ie5df8c8ea8785b8562866522f6d13e54b5ce52d5