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

Change-Id: I10e96f48dcd7134cf45a6d8406bf8b69f6593eba
5314 files changed
tree: 86d25aa684aa712602a2875c5606d9a47679e3c7
  1. 4/
  2. 5/
  3. 6/
  4. 7/
  5. 8/
  6. Android.mk
  7. CleanSpec.mk