am 83830a9b: Merge "Real fix for recent SystemUI crash."

* commit '83830a9bc602da739cb60ecd6a178f25de790854':
  Real fix for recent SystemUI crash.
tree: 80493a9caecaab5d2c9edea555a299a28017222e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml