| commit | 36b8d75f485b0dc4a87328bb88c391daefd4887f | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Wed Jan 23 20:52:28 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 23 20:52:28 2013 -0800 |
| tree | 800c87b68ad3026f965026a9ad3fff5fd4546b85 | |
| parent | 7195c8f25b6bfc7564701683d3e2e1ed1bdcfcc6 [diff] | |
| parent | 311ef539cffa35163eae64a93700ab049ceaf827 [diff] |
am 311ef539: (-s ours) am f0bf29df: am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen" # By Anju Mathapati # Via Android Git Automerger (2) and others * commit '311ef539cffa35163eae64a93700ab049ceaf827': frameworks: Display missing text on SimUnlockScreen