tree 714796797a846d57e3885183654a4ea668448161
parent 5752912e4bbf5696f514438e17fcc4c2610e5c59
parent 454a6255884c0899b1402a0d5f67547e47528739
author Android (Google) Code Review <android-gerrit@google.com> 1243016764 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243016764 -0700

am 9681a5e0: Merge change 2230 into donut

Merge commit '9681a5e06badbd817342e8f6be4ffbe9102c1e98'

* commit '9681a5e06badbd817342e8f6be4ffbe9102c1e98':
  runtime: Add CAP_SYS_NICE to the system server capabilities list so it