am 838ac1be: am e607e072: Merge "Remove TerminalAttributes."

* commit '838ac1bedbda912fe14868d166826114780857bb':
This commit is contained in:
Keisuke Kuroyanagi 2013-09-26 05:58:15 -07:00 committed by Android Git Automerger
commit c510695f93

Diff content is not available