| commit | 4b38af44a92215de139d2138484df5fbbe2b4ff3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Feb 01 10:01:22 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 01 10:01:22 2012 -0800 |
| tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 | |
| parent | 322e2109e317f627b5ea82979d471d87236b4241 [diff] | |
| parent | e8308aa156e8bc751fd7ae27dbb16eac8251f6a1 [diff] |
am 3f3afbef: Reconcile with ics-mr1-release * commit '3f3afbef0fc7c4199bb7d992dc52efaa6db1b91a':