OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 405dcc8 7dd9666)
Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214
authorAdam Lesinski <adamlesinski@google.com>
Fri, 20 May 2016 17:32:04 +0000 (17:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 May 2016 17:32:04 +0000 (17:32 +0000)
am: 7dd96663a0

* commit '7dd96663a0c728b4913ed4146cc442336833a1ca':
  Fix parsing of kernel wakelocks

Change-Id: I312c22fdbee545a2f7991c320ee4d5eea73decba


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help