tree e4343dd2c1a1156ff298fbef4464526bd175fb0a
parent 0d893015d5aada752f26c88614f31e930bcfaf5d
parent f6ac230342a495c03f4898761507864dcfcfe173
author Martijn Coenen <maco@google.com> 1502350594 +0000
committer android-build-merger <android-build-merger@google.com> 1502350594 +0000

Merge changes from topic 'binder_tests_aosp' am: 8f93ab17f9 am: 1bc063272a am: 9dada04d4c
am: f6ac230342

Change-Id: If8113607aec145f8d41f51494a9707f994f73bf2