tree a0e9e3b73075424d19457cd0f2b355bb39a93eb7
parent 9dbb045b236428bd82ed061d6bea3d0cf3138c8a
parent 8c2da24389c4b868e8a91c052f85eca8f4dc4846
author Marco Nelissen <marcone@google.com> 1401219610 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1401219611 +0000

Merge "Remove callback test"