tree 43f9d26b852f8ec9eb2b24aa6f6d428daff38db2
parent 39c4962580a52d5ca07f3576009564dddc8f4624
parent 60931a784ff5c7659a432ed7b4f5ea5a22156637
author Dianne Hackborn <hackbod@google.com> 1440037588 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440037588 +0000

am 60931a78: am dc4442f1: am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev

* commit '60931a784ff5c7659a432ed7b4f5ea5a22156637':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second