am bd2400a3: am 1adc92f4: Merge "allow time rw access to /dev/diag"

* commit 'bd2400a36d7825f05ceb7a10d1bb76ddf557a68d':
  allow time rw access to /dev/diag
am 8e7d2b62: am bd2400a3: am 1adc92f4: Merge "allow time rw access to /dev/diag"

* commit '8e7d2b62249877341155d8c5fc51fc6a75a1f6e2':
  allow time rw access to /dev/diag
Revert "allow time rw access to /dev/diag"

After discussion with Geremy and Dan, we want to spend some time and see if we can get time to stop using /dev/diag.

Reverting for now

This reverts commit 1ba185cd4eb1db56d50019da1e6b0ba1fc5d9cad.

Change-Id: If32c934c42b664c5447dc91ba391ae70db50be92
Merge "Revert "allow time rw access to /dev/diag""
am 60119e85: Merge "Revert "allow time rw access to /dev/diag""

* commit '60119e855450ee57abcdeb7b60868d08c6b2b5a5':
  Revert "allow time rw access to /dev/diag"
am 043f4c4e: am 60119e85: Merge "Revert "allow time rw access to /dev/diag""

* commit '043f4c4e378ec7806aa58ecf8168916f969d85ec':
  Revert "allow time rw access to /dev/diag"
am 0ba5a570: am 043f4c4e: am 60119e85: Merge "Revert "allow time rw access to /dev/diag""

* commit '0ba5a570bffe08d466709e59419692ffd6e930fc':
  Revert "allow time rw access to /dev/diag"
initial irsc_util domain

Initially unconfined and enforcing.

Change-Id: Iec0e4b873b1e098728f05e42db0be0e44664f3e9
Merge "initial irsc_util domain"
am b6ea7475: Merge "initial irsc_util domain"

* commit 'b6ea747510567c996550b3f6bd50417cd98a94ac':
  initial irsc_util domain
am 23c89290: am b6ea7475: Merge "initial irsc_util domain"

* commit '23c89290097964d9df4f02029c75970136ad492e':
  initial irsc_util domain
am c9ebe423: am 23c89290: am b6ea7475: Merge "initial irsc_util domain"

* commit 'c9ebe4235eb92d463e2d21566c7fa57a87a1938d':
  initial irsc_util domain
hammerhead: enable slimport detection after boot completion

To prevent slimport error during boot up, wait until boot
completion before start slimport detection.

Bug: 11518558
Change-Id: I4d3e8bf27cebc5e79d566400d768fadc2873e9b5
Remove include <linux/android_pmem.h>

This file is not needed any more and it doesn't exist in the uapi kernel
headers.

Bug: 11559337

(cherry picked from commit 452b39701108170215ec0c1fc23a97baefc97f15)

Change-Id: I75357925a64863fea5b71b3a61ba5f7029ab65ca
Merge "hammerhead: enable slimport detection after boot completion"
am 82468935: Remove include <linux/android_pmem.h>

* commit '82468935d03061529bd5887c8e916f0aa9e2af75':
  Remove include <linux/android_pmem.h>
Allow /dev/diag on non-user builds.

/dev/diag is accessed all over the place during development,
but is removed before final release to users. Allow access
on non-user builds.

Bug: 12174386
Change-Id: I2715031068b2f19d1b25d6029c1f260a81a98215
Merge "Allow /dev/diag on non-user builds."
am 6c3221f6: Merge "Allow /dev/diag on non-user builds."

* commit '6c3221f690d0883b9039efb4c1743591816876ed':
  Allow /dev/diag on non-user builds.
am dcbf1040: am 6c3221f6: Merge "Allow /dev/diag on non-user builds."

* commit 'dcbf10403f3dd3ba3ea44523c711c1f7f76f26b2':
  Allow /dev/diag on non-user builds.