am 2b9998fb: am ef1945f8: am 417e3041: am 8124e073: Merge "Fix unused parameter warnings"

* commit '2b9998fb90dd687f2344248d0c9b165bb7eea1e2':
  Fix unused parameter warnings
am 7b0ea426: am d7f78e88: am e3bdaeb6: am 2765e4fb: Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"

* commit '7b0ea4262b2ec5781faeca67762f03af3fb1c71f':
  Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS
am e92372ba: resolved conflicts for merge of 2237ca4c to jb-mr1-dev

* commit 'e92372ba9eaa04eb4ed7eb9417ee2be3515bd972':
  Fixing signed/unsigned comparison warnings
am 9342d910: am e92372ba: resolved conflicts for merge of 2237ca4c to jb-mr1-dev

* commit '9342d9101896d006a398de159409f08619fec004':
  Fixing signed/unsigned comparison warnings
am edb2d634: Merge "ueventd.rc: Add /dev/uhid for bluedroid" into jb-mr1-dev

* commit 'edb2d634b35ec1b0268ac7d9ddab8c8fc082a14e':
  ueventd.rc: Add /dev/uhid for bluedroid
am 59094a52: am edb2d634: Merge "ueventd.rc: Add /dev/uhid for bluedroid" into jb-mr1-dev

* commit '59094a52ff47e107d749d6094cf577019906e691':
  ueventd.rc: Add /dev/uhid for bluedroid
am 2be5338a: Merge "Multi-user external storage support." into jb-mr1-dev

* commit '2be5338a84f19b24b6515c0bfcf2f3f7b55262c1':
  Multi-user external storage support.
am b0d56eef: am 2be5338a: Merge "Multi-user external storage support." into jb-mr1-dev

* commit 'b0d56eef7b073461678751f56e24623f2e1ab581':
  Multi-user external storage support.
am de980f27: Omit multiuser.c from Windows builds.

* commit 'de980f27a701eb8f7130218f9bac768fe7155d30':
  Omit multiuser.c from Windows builds.
am 807a2f54: am de980f27: Omit multiuser.c from Windows builds.

* commit '807a2f54f313caa5d7cba85a924de0ab6b830b66':
  Omit multiuser.c from Windows builds.
Reconcile with jb-mr1-release - do not merge

Change-Id: I5602173e60967c0b027f926df862747b2cf1edde
am 2f86a384: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2f86a384743fd3f608e8e65e4d5f5328a0aedfcb':
  bluetooth: bring up with bluedroid stack
libext4_utils on host is now called libext4_utils_host so there is no name conflict

Change-Id: Ibc7923676925ed6942b3f672ee764cfaa98ee96e
Fix build by removing TAGS from host module

Change-Id: I0118cebff021b435baea0b46dd3c43250ef96632
Signed-off-by: Mike J. Chen <mjchen@google.com>
Support for multiple modules with the same name is going away.

Change-Id: I5006b467978071f9107babe532efa71d05061580
am ab163a9a: am c56f4285: am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367

* commit 'ab163a9a1784594b46217576d0fa991496f3d14e':
  Support for multiple modules with the same name is going away.
  Fix build by removing TAGS from host module
  libext4_utils on host is now called libext4_utils_host so there is no name conflict
am c14b5683: am ab163a9a: am c56f4285: am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367

* commit 'c14b56831d74d3d871cac8beb3024cedba7e7fa8':
  Support for multiple modules with the same name is going away.
  Fix build by removing TAGS from host module
  libext4_utils on host is now called libext4_utils_host so there is no name conflict
am 80da83ac: am cd82a6fe: am 36b1399d: Merge "diskconfig: Add missing include for loff_t"

* commit '80da83ac31925326b3a76f10564c05f2043c70f0':
  diskconfig: Add missing include for loff_t
am c3a4a054: am 3af04b71: am 7c386a61: Merge "Extend and document the "wait" command"

* commit 'c3a4a054a99b62cb4fd593d95f3b2b0017202b20':
  Extend and document the "wait" command
am bb0d0721: am 94938c9d: am ed2e672f: Merge "Print strerror for file read errors during flashing"

* commit 'bb0d0721e6bc5dcedc9bbbac0ea8fa4e57f487ad':
  Print strerror for file read errors during flashing