| commit | 6be1d8f92cfc98d9e4d16ec29a18a2f65f1620ee | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Fri May 11 15:13:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 11 15:13:26 2012 -0700 |
| tree | 20994980bab71e83e53f308c4be56031163ee6f1 | |
| parent | dfa3d8c7f1640503ca25570c1f21e3b8700ae5c7 [diff] | |
| parent | c494b1ba74029d2f54f8270eff454b3ccc48393a [diff] |
am c494b1ba: Merge "Disable Keyguard in OpenGL Tests" into jb-dev * commit 'c494b1ba74029d2f54f8270eff454b3ccc48393a': Disable Keyguard in OpenGL Tests