tree 04158750dcf2b2de22e83619bb0837b9243d5bb2
parent 2fdd64a3006532c97574c1e5ee63f90c498888d3
parent 30ff5a4dd1c7ef6ae6a774d334eea4f7d4ff9801
author Hall Liu <hallliu@google.com> 1502933461 +0000
committer android-build-merger <android-build-merger@google.com> 1502933461 +0000

Merge "Revert "Change testapps to reflect API fixes""
am: 30ff5a4dd1

Change-Id: If2aed4cdb8807ad621a61b9dfe5b0c03d22083ab