tree aaeddcb451233e15ebe78b4f4aaf711a6f5195fb
parent 62d799a7123eaac05378574c2ab4adc00f34adf9
author Jeff Sharkey <jsharkey@android.com> 1409296214 -0700
committer The Android Automerger <android-build@android.com> 1409331085 -0700

Keep tests building.

Bug: 17183379
Change-Id: I7f52af3201975e8c626a6c6d7f508fd8d006b204