Merge change 9628 into donut

* changes:
  Fix android.widget.cts.TabWidgetTest:testAddView.
tree: 2f7f654f3ad0ffc4f36173b68c5a05313372d249
  1. tests/
  2. tools/
  3. Android.mk