tree 771d57f47a95338ea6717d792bf15cdb8a6e577d
parent f5d9f891524862ba560650bd545668dc22622cdb
parent 48abd574cb1b7b0adbe1de36224fb974182aaa2d
author Doug Zongker <dougz@android.com> 1400002695 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400002695 +0000

am 48abd574: am 34ff5fe3: am 74b90b30: Merge "screen_ui: Initialize text buffer"

* commit '48abd574cb1b7b0adbe1de36224fb974182aaa2d':
  screen_ui: Initialize text buffer