tree b9ab78800a11f3cb0c9f231be8088593e577e2d4
parent 7ed1d6613e2f5aa05158a87888f5a6474eca5cc1
parent ffefd0fdd1baa66665ed6195b2adeb0e1e3bb7e4
author Brian Colonna <bcolonna@google.com> 1337007367 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337007367 -0700

Merge "Fix 6283709: set max FUL failed attempts to 5" into jb-dev