| commit | 9fc87770257db368afb4c05d5fca5c4f08026dc5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:21:12 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:21:12 2012 -0700 |
| tree | 1a324730e93109975022e2d300f3186a886ee9e7 | |
| parent | 8d7bcb4a0bf1765e90598afb6f802dd0b7794745 [diff] | |
| parent | f9cf347965f77f666af1d291d6387d18a9eac709 [diff] |
am f9cf3479: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f9cf347965f77f666af1d291d6387d18a9eac709':