diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-04-09 09:22:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-09 09:22:07 +0000 |
| commit | b2bd00447dc247dead444fd906eb4f950eb03d47 (patch) | |
| tree | e4946b98813f74917faf1271bf9685109b5436c7 /docs/html/sdk/api_diff/5/changes | |
| parent | 5b25236a87f7c96df9feed340701092cbb92fcc2 (diff) | |
| parent | 50807c178f8d491637cc3f7c83161258a9374ed7 (diff) | |
am 50807c17: am 7f9599d6: (-s ours) am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
* commit '50807c178f8d491637cc3f7c83161258a9374ed7':
Move display power controller to display manager service. (DO NOT MERGE)
Diffstat (limited to 'docs/html/sdk/api_diff/5/changes')
0 files changed, 0 insertions, 0 deletions