OSDN Git Service

Merge "Fix parsing of kernel wakelocks" into nyc-dev
authorAdam Lesinski <adamlesinski@google.com>
Fri, 20 May 2016 17:32:42 +0000 (17:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 May 2016 17:32:42 +0000 (17:32 +0000)
commitfea0c3af7abeec54f47292698e16a556f653bbc0
tree81227d10917ccd946e4461a5b7a6603f6869aded
parent6c7ea25a2b3f219dd3fe540fd97ee10ac5f2d77d
parent6f0d3992149aa782450667ed750fe0c3cf8ee334
Merge "Fix parsing of kernel wakelocks" into nyc-dev
am: 6f0d399214

* commit '6f0d3992149aa782450667ed750fe0c3cf8ee334':
  Fix parsing of kernel wakelocks

Change-Id: Ibc60849809b5553e820833437a9d2d47d065a38e