merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I8e6b252cb0d4b89351a9fbf83ac46fe94c11e886
auto-generated blob list

Bug: 4295425
Change-Id: I4ff3fbeca7cae82b3646f7549d158906ac8bac36
am a4d7d077: auto-generated blob list

# Via Jean-Baptiste Queru
* commit 'a4d7d0771a5e54a27b3b6c499580d0b4c92c3344':
  auto-generated blob list
Merge tag 'android-4.2.2_r1' into jellybean

Android 4.2.2 release 1

Conflicts:
	proprietary-blobs.txt

Change-Id: Iff6a3e3cd3afd72c710a1f4f87101ac8b8084913