| commit | 0cf28dc5cc202b9dcca6ec22ba57e1600406cb26 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:37:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 07:37:19 2012 -0700 |
| tree | 2df133e5b5cd33c8a0f5388516d9a273a1fce219 | |
| parent | 35b68a5ce2474731e3a06ef482069df085f2d6b1 [diff] | |
| parent | 990287dbdc2ba8b85811d6fe20c44c6283aee04b [diff] |
am 990287db: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '990287dbdc2ba8b85811d6fe20c44c6283aee04b':