| commit | 3add4aa7025916997acfd0c712965ae63b441bb0 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Mon May 14 08:35:07 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 14 08:35:07 2012 -0700 |
| tree | 0e7ded7257eebda1f2bb06fd4aa836b0ec05a969 | |
| parent | 1662a896c7fdef5a558c3f591723e8c5f49f7e58 [diff] | |
| parent | 6be1d8f92cfc98d9e4d16ec29a18a2f65f1620ee [diff] |
am 6be1d8f9: (-s ours) am c494b1ba: Merge "Disable Keyguard in OpenGL Tests" into jb-dev * commit '6be1d8f92cfc98d9e4d16ec29a18a2f65f1620ee': Disable Keyguard in OpenGL Tests