| commit | 843b014aca849a80fe1b2193dc53228f7a8525bd | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Mon Oct 01 10:13:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 01 10:13:52 2012 -0700 |
| tree | 532c5bfa9fe2f954e73ade0a78b22ec62cdc3a32 | |
| parent | 6c7169722f943f3cc2c23ac6b7469f2e7dc2358f [diff] | |
| parent | 489c1e9f82250770004ec9080778546b040f6146 [diff] |
am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev * commit '489c1e9f82250770004ec9080778546b040f6146': Get rid of preventScreenOn().