| commit | c7239363a9426eb0b9dd719984493f0f3815ddfe | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 07 07:54:43 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 07 07:54:43 2012 -0800 |
| tree | 205374dc736377ed213616d89593722a4571510f | |
| parent | 5380148f83d154e22cdc2e4e170a57f1e37754e6 [diff] | |
| parent | 2480debbb932d211008780ba30988c3e3977a3fe [diff] |
am 2480debb: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '2480debbb932d211008780ba30988c3e3977a3fe':