am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev

* commit '41df5bfc0d50d36cb2c46d539043813bebbb1289':
  Update javadoc on DPM.setGlobalSetting
tree: c40301c5a88b3fbe83b645265d8e70a4655203b3
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py