tree 4c3f62752af1759b842444813fbda3c35a80c329
parent e11b76d3efb056edea301d53a354d0730adf3520
parent e951ef07dd8cb36ec0e127e80f5d558b8a2d6125
author Jeff Brown <jeffbrown@google.com> 1285985022 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285985022 -0700

am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread

Merge commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125' into gingerbread-plus-aosp

* commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125':
  Wait for initial device scan to finish before updating config.