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:38:53 +0000 (15:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 15:38:53 +0000 (15:38 +0000)
commit0356f46f18c8e31b9d475914fcf91daae5a6bee1
tree484575bd69307473feccd4eb471b3d8bfe908a93
parent365a0d402a1602eaa9a2f0a15d7b425d0432a804
parent9a9a08876151ca871ea15f2bde1f3d6d688e67f5
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

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

Change-Id: I4e11dc5ea337ac178a494d565512ebdcc9691caf