tree c3f61c639d5db40810957d496318a40be9116734
parent 9edaaa4cdfd4a9765e67807bb82edd4c2ded4ae0
parent 6df522ec3d4a2c7ff57d28d3802ec46263c3f2fa
author Hiroshi Yamauchi <yamauchi@google.com> 1449540784 +0000
committer android-build-merger <android-build-merger@google.com> 1449540784 +0000

Merge "Replace proxy class names with deterministic ones for test output." am: e8be90a673
am: 6df522ec3d

* commit '6df522ec3d4a2c7ff57d28d3802ec46263c3f2fa':
  Replace proxy class names with deterministic ones for test output.