AI 146177: am: CL 145969 am: CL 145735 Suppress the flaky DatabaseLockTest
  Original author: brettchabot
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146177
1 file changed