tree 20bbf5f31440b5d837e6997e44e3fdf5c981d6b7
parent d293f609329e138b0d94ec24b73774cc67b2c5e4
parent 4eb18ffbd6348e34f648d4cc3c3d1f2dec3d68fe
author Wink Saville <wink@google.com> 1395779050 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395779050 +0000

am 4eb18ffb: Merge "Improve STK idle mode text handling"

* commit '4eb18ffbd6348e34f648d4cc3c3d1f2dec3d68fe':
  Improve STK idle mode text handling