tree 046c106ae121e70062f768337cf42f4389c4b223
parent 743ec69e51ba798677366ad7dc92053120625490
parent 83ad89579e22228c1a48a2a488b86fc0d41057a6
author Jamie Gennis <jgennis@google.com> 1366923038 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366923038 -0700

am 83ad8957: am 5b6ebd71: Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev

* commit '83ad89579e22228c1a48a2a488b86fc0d41057a6':
  libgui_test: fix a couple minor test issues