tree 5eae83d698ef6ab1e5f06b70004b7d4e5f92086e
parent cf7c5b55b8d5c7ffe780849e937b0b542e98278a
parent be4e04f6be64abdd8fad08223274c4b14fe3d1fb
author Hall Liu <hallliu@google.com> 1502934746 +0000
committer android-build-merger <android-build-merger@google.com> 1502934746 +0000

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

Change-Id: I9e6333d1dd68a35245c8cf160edd60a808edfb2e