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)
commit097e10974e577ca5565c6cfa23f3b51fe3d7c5ab
tree267d0725ef99229ed23a5c152bf898ddf49904f2
parent2e733dcf06c8160656c37c5ce875a69280f52661
parent31346bb9622e96aa6b93838b2f8b144360503098
am 31346bb9: Merge "Fix a build break due to a change in libui"

* commit '31346bb9622e96aa6b93838b2f8b144360503098':
  Fix a build break due to a change in libui