merge in jb-mr1-release history after reset to jb-mr1-dev
am 67c01dfe: am 7918d816: Merge "Wrap system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev

* commit '67c01dfe6db2bbe386eb98114c2a89f7dbf7bd2d':
  Wrap system calls in TEMP_FAILURE_RETRY.
am 0a4a4bbb: am a6cf7746: Merge "Wrap more system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev

* commit '0a4a4bbb21919a2730cb6f6ba207c10cef52535a':
  Wrap more system calls in TEMP_FAILURE_RETRY.
Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev
am 1683413f: Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev

* commit '1683413f413eb1b77f527247db2df31eae93ee3a':
  DO NOT MERGE Add event log tag for cert pin failures.
am 1e3cab0b: (-s ours) am 1683413f: Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev

* commit '1e3cab0b88a15670345fc9e89d649de9e028e640':
  DO NOT MERGE Add event log tag for cert pin failures.
am 1683413f: (-s ours) Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev

* commit '1683413f413eb1b77f527247db2df31eae93ee3a':
  DO NOT MERGE Add event log tag for cert pin failures.
merge in jb-mr1-release history after reset to jb-mr1-dev
init: Don't read local properties if ro.debuggable=0

Bug: 7195965
Change-Id: I29fdad61aa61f2c46d49db227cf7b84d9cc6f25d
Merge "init: Don't read local properties if ro.debuggable=0" into jb-mr1-dev
am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev

* commit 'e1df9ad215af6e51a2d8fb1d0306e00c7b510b62':
  init: Don't read local properties if ro.debuggable=0
am a8b91609: am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev

* commit 'a8b916093772627f55fa1bfb624fdebf38af171b':
  init: Don't read local properties if ro.debuggable=0
Print the revision number in the tombstone file.

Bug: 7168261
Change-Id: Icb412760d018e4bbb1a5d742ed7d484d5cf6b470
am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev

* commit 'e1df9ad215af6e51a2d8fb1d0306e00c7b510b62':
  init: Don't read local properties if ro.debuggable=0
merge in jb-mr1-release history after reset to jb-mr1-dev
Add explicit sync call to ion library

Bug: 6854979
Change-Id: I535d55af897eeb4ed707b5da54f3fbf36afa452c
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Move AndroidConfig.hs to the build project.

Change-Id: I482e36f9e7f665d7cfe43463c9cbc15846e8b20a
Reconcile with jb-mr1-release - do not merge

Change-Id: If24ab92e844fb1a6e6cdec7bb9cdfba887df812a
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.

remove system/bluetooth stuff.

bug 6849488
Change-Id: I81a94d34a4363562a74fa2e574828fd919cfe18c
ANW: fix an fd leak

Change-Id: Id44cae6732c6694d2f470cbdfa5f59e7474f704f