am 91a92009: am 6ad79259: am 745873f4: am bf307991: am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev

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