Merge de99450655a34f355b7c24cdb2337c0b084b75e8 on remote branch

Change-Id: I155ee19739ffc2b9c7128360cdd2872ddb0e0944
tree: 7f4d372e23ad822cd7210dccae32b1fd948d55a3
  1. miniui/
  2. oem-recovery/
  3. tools/
  4. Android.mk
  5. NOTICE