| commit | 6f785ea12297e7464c3bfa8b3074ff0b7fc9c2db | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:22:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:22:52 2012 -0700 |
| tree | 72eb425348bf7d44b464f26200dd514baa12a75a | |
| parent | de25d3a88d8b9dc4f4270eae561b23dab2a3a52d [diff] | |
| parent | bd815ec0000ac77ec2a1d1c026d62f194c4ed6ea [diff] |
am bd815ec0: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'bd815ec0000ac77ec2a1d1c026d62f194c4ed6ea':