David Brown 97d88927f2 am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread ...

Merge commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a'

* commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a':
  Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)

2010-10-15 13:40:16 -07:00

..

java

am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread

2010-10-15 13:40:16 -07:00

mockril

resolved conflicts for merge of d4e3bf4d to master

2010-10-12 11:05:54 -07:00

tests

resolved conflicts for merge of d4e3bf4d to master

2010-10-12 11:05:54 -07:00