tree aa7aa45add93981dff17b8f9fc31046dea0205fa
parent 3f73173fcc2d8671b60591276a6072dade44131a
parent 1d96695b113c9a2144743ce45e65eb53828f90ec
author The Android Open Source Project <initial-contribution@android.com> 1377035349 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1377035349 -0700

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

Conflicts:
	fstab.deb
	init.deb.rc