tree 578fe59cee3b9695715ba71d96659c39dbb9931b
parent 79816e3f9dd6b9ba6ae4623f6d1274a973abea9f
parent d312e617057d90639afa8fd20bf895e008127189
author The Android Open Source Project <initial-contribution@android.com> 1377035546 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1377035546 -0700

Merge remote-tracking branch 'goog/jb-mr2-zeroday-release' into HEAD

Conflicts:
	kernel