tree 2b67e9c2b68882908fe0608d361c8af2e3c8d6be
parent db29e46ae92a5f1b5f427b1d7cdef2e457612f57
parent 91fc6d1f9cd5e83eec5753ef92960d03367c33a6
author Pavlin Radoslavov <pavlin@google.com> 1451352929 +0000
committer android-build-merger <android-build-merger@google.com> 1451352929 +0000

Merge "Use GID "wakelock" to control access to kernel wakelock" am: 60d142c54b
am: 91fc6d1f9c

* commit '91fc6d1f9cd5e83eec5753ef92960d03367c33a6':
  Use GID "wakelock" to control access to kernel wakelock