| commit | f4f35f8e8d16c57a76befdd66dd39b894ac93548 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Mon Nov 26 11:45:25 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 26 11:45:25 2012 -0800 |
| tree | 1cd542abce91e54e491c8976aa4ffe3e2614ddc4 | |
| parent | 41886ecf331c40e4888a3f4010fded8679fa2a58 [diff] | |
| parent | 1ee927f42bea9817fc16d5ee6532ce46e099f4b4 [diff] |
am 1ee927f4: am 8de91ce1: am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev * commit '1ee927f42bea9817fc16d5ee6532ce46e099f4b4': Ignore invalid combination of PowerManager flags.