OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Don\'t clear the btsnoop log ringbuffer on compress...
authorSharvil Nanavati <sharvil@google.com>
Mon, 21 Mar 2016 21:31:24 +0000 (21:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Mar 2016 21:31:24 +0000 (21:31 +0000)
commit9a9a08876151ca871ea15f2bde1f3d6d688e67f5
treedc8cde3b6dd4d40c9eee5c329d07432031ab6904
parent4498648ede31cea4858322620587c8da7ea0d1ac
parent32e0b1129eddff87cdd1843fcb79e34f34ab7230
Merge "DO NOT MERGE ANYWHERE Don\'t clear the btsnoop log ringbuffer on compress." into cw-e-dev
am: 32e0b11  -s ours

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