OSDN Git Service

Merge "Run \'nativeperms\', remove Brillo #ifdef." am: a7ba9d0 am: f949746
authorJorge Lucangeli Obes <jorgelo@google.com>
Thu, 14 Apr 2016 20:22:20 +0000 (20:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Apr 2016 20:22:20 +0000 (20:22 +0000)
am: 180cce9

* commit '180cce95140f4b3ecb55dba38e3fa544ce4a519d':
  Run 'nativeperms', remove Brillo #ifdef.

Change-Id: Ibc4f71b361ae03ea92724c09abeff711eeef78b0


Trivial merge