tree 510124dc1a753cbdd376827400c60c22b32134d6
parent f053e2367d4859adf9488bd1712bdbe8f647eeb8
parent 676c519ec4509c799049bae5f6b20748ee5210c1
author Jeff Brown <jeffbrown@google.com> 1338417621 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1338417621 -0700

Merge "Increase busy timeout." into jb-dev