| commit | 50beaf89feb0e84892558a8ebac378d3233d5499 | [log] [tgz] |
|---|---|---|
| author | Alon Albert <aalbert@google.com> | Tue Nov 19 11:08:54 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 19 11:08:54 2013 -0800 |
| tree | ecf315e5cb4f3d616c1f028d8bf3af1855b72861 | |
| parent | 3cf6b96bc2beb0ceb8ce46f0bd62898bb36c3003 [diff] | |
| parent | 20360f2fdd7ad2de1234b7ed61e3ea120f0dc635 [diff] |
am 20360f2f: am 141dd1b4: am 0aeb0943: Merge "Ignore Wakelock Under-Locked Exception" into klp-dev * commit '20360f2fdd7ad2de1234b7ed61e3ea120f0dc635': Ignore Wakelock Under-Locked Exception