tree 8343e13fe04741e5a6ae4a38abff402d8ed0127a
parent fd2e1af29a91a943e3e5cb05364a8e65d5162ddb
parent 8288531a14c1ebbd36b2d1ba0d76a9a40110179e
author Dan Shi <dshi@google.com> 1490980584 +0000
committer android-build-merger <android-build-merger@google.com> 1490980584 +0000

Merge "Add test config to binderAddInts" am: d89f0cb87b am: 33e29525e2
am: 8288531a14

Change-Id: I00dfaece3d4178fa99edba39496887d20941190e