Merge "mako: remove usb.host feature" into jb-mr1-dev
am f608db22: Merge "mako: remove usb.host feature" into jb-mr1-dev

* commit 'f608db225c5ead1c255fd84fa7f5431c2e3b3a72':
  mako: remove usb.host feature
am bc73a5ab: am f608db22: Merge "mako: remove usb.host feature" into jb-mr1-dev

* commit 'bc73a5abc1a8da36deabcaa74b43e051ad7ce767':
  mako: remove usb.host feature
am cf29e3a2: am bc73a5ab: am f608db22: Merge "mako: remove usb.host feature" into jb-mr1-dev

* commit 'cf29e3a2db91ef73d96a74463d4133e38dabf134':
  mako: remove usb.host feature
merge in jb-mr1-release history after reset to jb-mr1-dev
Protect /data/media directory.

Bug: 7403811
Change-Id: If1366b1f42c979bbb00a0433d19f9effc7d67c7d
am c88fc83a: Protect /data/media directory.

* commit 'c88fc83a687b6afb10872110633d73785ccfddee':
  Protect /data/media directory.
am d19c4e71: am c88fc83a: Protect /data/media directory.

* commit 'd19c4e7110eacefaf020d86dbca071a6d9eb870d':
  Protect /data/media directory.
am 552ce502: am d19c4e71: am c88fc83a: Protect /data/media directory.

* commit '552ce502c4006068943bb011b915bdcd0fa044d3':
  Protect /data/media directory.
merge in jb-mr1-release history after reset to jb-mr1-dev
enable wakelock debug on suspend

Change-Id: Ia3e6cc0beb5873927c513b5a9da3d8c781b2d59d
Signed-off-by: Iliyan Malchev <malchev@google.com>
am fb09d7fa: enable wakelock debug on suspend

* commit 'fb09d7fa96ee2dcc6d8b283862a3308b5c0ced02':
  enable wakelock debug on suspend
am 6f241550: am fb09d7fa: enable wakelock debug on suspend

* commit '6f2415504191c3e8c4b0b2a97039003713673553':
  enable wakelock debug on suspend
am b4b3a1a3: am 6f241550: am fb09d7fa: enable wakelock debug on suspend

* commit 'b4b3a1a3e07e734a3ce68bffbb109f866dd70a36':
  enable wakelock debug on suspend
merge in jb-mr1-release history after reset to jb-mr1-dev
mako: disable WiFi roaming

Change-Id: If1b5041b7a88119407c356a1f15c12df36435938
Signed-off-by: Iliyan Malchev <malchev@google.com>
Revert "mako: disable WiFi roaming"

This reverts commit 9c071a70f62fc67989ac4ccb7968639a1d29ddca.
am 9c071a70: mako: disable WiFi roaming

* commit '9c071a70f62fc67989ac4ccb7968639a1d29ddca':
  mako: disable WiFi roaming
am 61d72e83: Revert "mako: disable WiFi roaming"

* commit '61d72e8323117a7922ba8c986a699a60d88c6e09':
  Revert "mako: disable WiFi roaming"
am 7b63beac: am 9c071a70: mako: disable WiFi roaming

* commit '7b63beac6ff5384b90e294125541cdd66104ca1c':
  mako: disable WiFi roaming