OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da394bb b6bf4cc)
am 35a8f94d: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 15:26:56 +0000 (08:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 21 Mar 2012 15:26:56 +0000 (08:26 -0700)
* commit '35a8f94da6a8a3a6757e5663bfcbcd044f72a92a':
  Fix 5960562: Show emergency button on PukUnlock screen


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