commit | f59467b3d6c5df8bf90de799e212275e5c26de86 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Tue Jun 12 12:45:24 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 12:45:24 2012 -0700 |
tree | 1b75245e7e20a7336a5f0527f522052670c6b4af | |
parent | 345a3835aafd01e837741aa6ea733d8dc1b7dd2b [diff] | |
parent | aabd9c230f9849e8d52d2cb2e33bac7f163590d5 [diff] |
am aabd9c23: Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev * commit 'aabd9c230f9849e8d52d2cb2e33bac7f163590d5': Fix issue #6634325: View.setKeepScreenOn and...