| commit | 22ad682ad7e165e244e4f7de121fe25dad65f60d | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Thu Nov 01 10:05:39 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 01 10:05:40 2012 -0700 |
| tree | 6098fcb0618e108e1fd0319a07411b1f6ac01489 | |
| parent | 89c359c8eedf324ceea3406b9654e8bfd3524e5b [diff] | |
| parent | dbe24b7def8df3a539790827d3f395f4d933802b [diff] |
Merge "Cancel camera launch on screen off." into jb-mr1-lockscreen-dev