| commit | 5869363b06dc81b83cff7e75ffd48559938915fc | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Tue Jun 23 02:35:13 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 23 02:35:14 2015 +0000 |
| tree | 424ad6d3c7f76f95cf990308603b57fe75a86f79 | |
| parent | 725f145e0ffe18b2c81dbf07c8cb7633ab99b682 [diff] | |
| parent | e1633addd38cb5c66f642556b8968293fd5dc5b0 [diff] |
Merge "Suppress pausing activities when screen off due to proximity." into mnc-dev