tree b9fe2af11f8268ed3652df56fd9772d5569bd2a5
parent f958732bd3924205d9f8bda94f4f6e3bb4045b28
parent 9d0908919a65a4f3158a8fc50aaf320dfed36278
author Dianne Hackborn <hackbod@google.com> 1339522811 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339522811 -0700

Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev