| commit | a5ba888d8746c84ba509d074fa3cd7d006e7c803 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 15:47:58 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:47:58 2012 -0800 |
| tree | fd346c3e469c3589b94e2830636ba39f2010f195 | |
| parent | 279d16a993d23c94d9fa5bfa667ac65a4b48acd4 [diff] | |
| parent | 37ead709c672dec125158ecad1cd9b9322803996 [diff] |
am 37ead709: am ffa91c3c: Reconcile with jb-mr1-release - do not merge * commit '37ead709c672dec125158ecad1cd9b9322803996':