OSDN Git Service

Merge "Limit btsnoop file size (4/9)" into oc-dev
authorAjay Panicker <apanicke@google.com>
Thu, 4 May 2017 23:21:19 +0000 (23:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 May 2017 23:21:19 +0000 (23:21 +0000)
am: b72a8b5ab3  -s ours

Change-Id: I2ecb2e2c297953eba1f515e636c6204e8474591e


Trivial merge