tree 5d7217ac31912f1a510fddc17048fd542e3897f2
parent 1cd5242349bb1ef10eca76ff2c3e17415aecdf9d
parent 74b90b309f67dc3b8bb74e47c4eddf7ce511bc35
author Doug Zongker <dougz@android.com> 1400002134 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400002134 +0000

am 74b90b30: Merge "screen_ui: Initialize text buffer"

* commit '74b90b309f67dc3b8bb74e47c4eddf7ce511bc35':
  screen_ui: Initialize text buffer