| commit | 676aaa5f36bf1caa1b41631e0cdb476bbed20e08 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 12 16:59:07 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 12 16:59:07 2012 -0700 |
| tree | 6218316845ad145937fc082f7e16405f9fa7f665 | |
| parent | 1fc8975fa43fbc3ee2d3460bd8beabdf432e5cce [diff] | |
| parent | 2219bd26bde084d4703cab9bb85982e41ad01f28 [diff] |
am 2219bd26: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '2219bd26bde084d4703cab9bb85982e41ad01f28':