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

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