commit | 815b329af8704e58008860318429f2c70ec547f0 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 01 17:10:37 2011 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 01 17:10:37 2011 +0000 |
tree | 3b9471866672cee71d17b2a31182c826b93af977 | |
parent | 299078e1600325653b579c7dd8bb4dbc2666c49e [diff] | |
parent | 7d1737e045ae970049e723c5b3c681860d552ad6 [diff] |
am 7d1737e0: Reconcile with ics-factoryrom-2-release * commit '7d1737e045ae970049e723c5b3c681860d552ad6': Revert "Merge "Fix WPS pin input UI" into ics-mr0"