Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ie4e99d75619990884aec77e04107ed185b8f69a6
tree: 0ab9f5066e7fe522540774e39282baffb608138f
  1. res/
  2. src/
  3. .gitignore
  4. Android.mk
  5. AndroidManifest.xml
  6. project.properties