diff options
| author | John Spurlock <jspurlock@google.com> | 2012-11-01 10:05:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-01 10:05:40 -0700 |
| commit | 22ad682ad7e165e244e4f7de121fe25dad65f60d (patch) | |
| tree | 6098fcb0618e108e1fd0319a07411b1f6ac01489 /core | |
| parent | 89c359c8eedf324ceea3406b9654e8bfd3524e5b (diff) | |
| parent | dbe24b7def8df3a539790827d3f395f4d933802b (diff) | |
| download | frameworks_base-22ad682ad7e165e244e4f7de121fe25dad65f60d.zip frameworks_base-22ad682ad7e165e244e4f7de121fe25dad65f60d.tar.gz frameworks_base-22ad682ad7e165e244e4f7de121fe25dad65f60d.tar.bz2 | |
Merge "Cancel camera launch on screen off." into jb-mr1-lockscreen-dev
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions