OSDN Git Service

(root) / android-x86 / frameworks-native.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 90bb222 75991b5)
resolved conflicts for merge of b078d942 to ics-mr1
authorRobert Ly <robertly@google.com>
Thu, 19 Jan 2012 21:25:07 +0000 (13:25 -0800)
committerRobert Ly <robertly@google.com>
Thu, 19 Jan 2012 21:25:07 +0000 (13:25 -0800)
commit75a4189c2e53d286092b4016d6db0e7bb450f361
tree485b152b97bf8321fdd223f35587bb4294672be8tree | snapshot
parent90bb222c3ec1c7bf5f5997197808de09a91932bfcommit | diff
parent75991b50d8119f20d0caef032876342354802967commit | diff
resolved conflicts for merge of b078d942 to ics-mr1

Change-Id: I831c06f2c198cc8825788a05770397457e8d511c
frameworks/native
About OSDN
Find Software
Develop Software
Help