tree a1ddc9002660f7088eec7ff583f67119763a4fe4
parent 0ffb420321fa4510883b8539eb4312b5419a0919
parent a437c497e979206047ac8108296d7522291f143a
author Steven Moreland <smoreland@google.com> 1479420020 +0000
committer android-build-merger <android-build-merger@google.com> 1479420020 +0000

Merge "Remove name collisions in java onTransact."
am: a437c497e9

Change-Id: Iece9d17b1b1c5824d0d45914bfda70634ce5f35f