OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 901e78d 68c79e2)
am 54854d31: Reconcile with ics-mr0-release ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 22:57:48 +0000 (14:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Dec 2011 22:57:48 +0000 (14:57 -0800)
* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
  More fixing for issue #5366535: Lockscreen has wrong layout...
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...


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