am 3e210d17: resolved conflicts for merge of 1e8a87dd to master

* commit '3e210d179b80c1d09bb9b44c0aefde1daf3801cf':
  send accessibility events on view property invalidation
tree: 4c775c405cd5cf3996ef9567ad82e412818ea940
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml