OSDN Git Service

Merge "Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev...
authorRubin Xu <rubinxu@google.com>
Thu, 5 May 2016 13:22:39 +0000 (13:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 May 2016 13:22:39 +0000 (13:22 +0000)
am: d604ed836f

* commit 'd604ed836f81007055ea48449ea3f5edc13e843f':

Change-Id: Ief223bcb6f7db9d5a8f413117aa616d6c2a63341


Trivial merge