OSDN Git Service

Merge "Fix issue #31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev
authorDianne Hackborn <hackbod@google.com>
Thu, 6 Oct 2016 20:58:58 +0000 (20:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 20:58:58 +0000 (20:58 +0000)
am: 534a17e96c

Change-Id: Iba8a4f4447f4c70da0d466eaa824a24a6488a975


Trivial merge