am 31346bb9: Merge "Fix a build break due to a change in libui"
authorDan Stoza <stoza@google.com>
Tue, 9 Dec 2014 13:18:48 +0000 (13:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Dec 2014 13:18:48 +0000 (13:18 +0000)
* commit '31346bb9622e96aa6b93838b2f8b144360503098':
  Fix a build break due to a change in libui


Trivial merge