commit | ee4934f63d66ea5fc7d2f89671b4b4ad11d9badb | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 13 19:13:14 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 13 19:13:14 2011 -0800 |
tree | 96ed97d9b7ef0916f00bb824bac874dce11c1ab8 | |
parent | b6062546c4702d4c0c3def706f45a176a7552e12 [diff] | |
parent | 2e40a8828af426362b693b59ec3cf5863fb6b419 [diff] |
am 2e40a882: Reconcile with ics-mr1-release * commit '2e40a8828af426362b693b59ec3cf5863fb6b419':