OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6d711c bb92112)
Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge: 2feb18d...
authorChris Elliott <chriselliott@google.com>
Mon, 3 Nov 2014 21:13:02 +0000 (21:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Nov 2014 21:13:02 +0000 (21:13 +0000)
automerge: bb92112  -s ours

* commit 'bb9211236cf6104d16fc09b58550ce692d9af4e9':


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