tree f06800285af964a6aa226a3e05bed676dc0b75c4
parent 04eb4227b0ee880141d6ffbf170e79b78affea15
parent 0e1313cdb1d5d21e4d6123f77b4238f1c8c2d564
author Mark Salyzyn <salyzyn@google.com> 1402350385 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402350385 +0000

am 0e1313cd: Merge "libgui: 64-bit compile issues"

* commit '0e1313cdb1d5d21e4d6123f77b4238f1c8c2d564':
  libgui: 64-bit compile issues