OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Don\'t clear the btsnoop log ringbuffer on compress...
authorSharvil Nanavati <sharvil@google.com>
Tue, 10 May 2016 15:42:09 +0000 (15:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 15:42:09 +0000 (15:42 +0000)
commit97377a16b8eb837f3f3397edae7dc2f69d9e4d4f
tree484575bd69307473feccd4eb471b3d8bfe908a93
parent8a1b08aecf8ce2a17ac8064468bdd3e37a7a4d17
parent0356f46f18c8e31b9d475914fcf91daae5a6bee1
Merge "DO NOT MERGE ANYWHERE Don\'t clear the btsnoop log ringbuffer on compress." into cw-e-dev am: 32e0b11  -s ours am: 9a9a088761  -s ours
am: 0356f46f18  -s ours

* commit '0356f46f18c8e31b9d475914fcf91daae5a6bee1':
  DO NOT MERGE ANYWHERE Don't clear the btsnoop log ringbuffer on compress.

Change-Id: I89f9b0bdba5088df40d8b7766ce2ad9372e2d8dc