tree 3354f44c78ee2597244e8f2bf1d984f34b1eee3c
parent 869042581c78cdee6adb7d702c672b8a1d15ee16
parent d83d4c86c89357a74e94963994ad0c42ea7299c3
author Jeff Hao <jeffhao@google.com> 1386117272 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386117272 -0800

am d83d4c86: Merge "Fix stack trace for proxy methods and added test case."

* commit 'd83d4c86c89357a74e94963994ad0c42ea7299c3':
  Fix stack trace for proxy methods and added test case.