am 2115f63c: Merge "Add contentDescription attribute to setup wizard video and image"

* commit '2115f63cbaf74b828375d65aee3e93b097aaba5d':
  Add contentDescription attribute to setup wizard video and image
tree: d72fb2dc012dd072aa784309cc57273dc8083fe5
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk