diff options
author | Jeff Brown <jeffbrown@google.com> | 2014-04-09 09:12:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-09 09:12:40 +0000 |
commit | 7f9599d63c892934c7f8a2e46d1e518ddb0d43df (patch) | |
tree | 6cb03cde27062bdd6cc136caa20e5fe1e41195ae /core/jni/android_os_SELinux.cpp | |
parent | 668b1bf80b0e34e7079f826cd9e7358835a1e9cd (diff) | |
parent | ea72cdf22f8efde4d3b872a60587e4b26bc93e43 (diff) | |
download | frameworks_base-7f9599d63c892934c7f8a2e46d1e518ddb0d43df.zip frameworks_base-7f9599d63c892934c7f8a2e46d1e518ddb0d43df.tar.gz frameworks_base-7f9599d63c892934c7f8a2e46d1e518ddb0d43df.tar.bz2 |
am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
* commit 'ea72cdf22f8efde4d3b872a60587e4b26bc93e43':
Move display power controller to display manager service. (DO NOT MERGE)
Diffstat (limited to 'core/jni/android_os_SELinux.cpp')
0 files changed, 0 insertions, 0 deletions