OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9932235 7eeaf3f)
resolved conflicts for merge of 7eeaf3f0 to ics-aah
authorJason Simmons <jsimmons@google.com>
Tue, 24 Jan 2012 21:16:19 +0000 (13:16 -0800)
committerJason Simmons <jsimmons@google.com>
Tue, 24 Jan 2012 21:16:19 +0000 (13:16 -0800)
commit717c37944cfdaed5f55d2a124f322c607892ba87
tree3fae2529a948c9ebbccd85c34ba26dbaf46f4992tree | snapshot
parent99322356a0cde6c48b9d08695c8d225d80cc5788commit | diff
parent7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839commit | diff
resolved conflicts for merge of 7eeaf3f0 to ics-aah

Change-Id: I92b709268e22e3c3e9590c15173ab073b37db726
services/audioflinger/AudioFlinger.cpp diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help