JSS15K

Matching 1d96695b113c9a2144743ce45e65eb53828f90ec

Change-Id: I2afd65f6277a914ab8f998be0202c5c4bf7b9539
Snapshot at SHA1 71dcbc3b13884ce144b2adc749528ae37257158c
Merge branch 'jb-mr2.0.0-release' of http://android.googlesource.com/device/asus/deb into HEAD

Conflicts:
	fstab.deb

Change-Id: Ic724049ae31f8e57cc4e1746234252c835edd58a