tree 2b6d3121e3068e304270919e5c0fdcad926b0116
parent 9ef0283bdcd9534cc09ae37eb2b78771b95247b5
parent 0406e48db9d445227d66277fd786059c0c1074eb
author Ben Murdoch <benm@google.com> 1288951941 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1288951941 +0000

Merge "Work around race condition in CallBackProxy."