resolved conflicts for merge of 4385882c to jb-mr1-dev-plus-aosp

Change-Id: I2d7c57c43249cfbb0adacefebe4c1ec0fef1dc9e
1387 files changed
tree: 01610dec479020fa54355b283d31f8c58b1c59f3
  1. 4/
  2. 5/
  3. 6/
  4. 7/
  5. 8/
  6. Android.mk
  7. CleanSpec.mk