am de893af9: am d2b65b2b: am 08592bd0: Merge "Frameworks/base: Add tracing system properties"

* commit 'de893af974dbc95dcbe2da5c56ed1a718f21729a':
  Frameworks/base: Add tracing system properties
tree: c468c16f1bea102c43cb94e3e6f10d33ea72cb87
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py