tree 24076b4e8ab384874c6f85315a937c7cf2453d00
parent 4c4c1b94f9aaa2290c2e2149df9153213ff0381a
parent e292d611d9246e08ee5ef898bff0868382754509
author Jeff Sharkey <jsharkey@android.com> 1421181033 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421181033 +0000

am e292d611: am e6033f3e: Merge "Wait for DocumentsUI ANR timeout; expand drawer." into lmp-mr1-dev

* commit 'e292d611d9246e08ee5ef898bff0868382754509':
  Wait for DocumentsUI ANR timeout; expand drawer.