| commit | 7057d741714bb15d1316842e47718a2531bedac4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 10:07:46 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 10:07:46 2012 -0700 |
| tree | 6c5488e5b026cda1c3bc78227a6c39136fc6b89a | |
| parent | f62edca733b5dcc52d00a396f6a208f5955c174f [diff] | |
| parent | ff81427a2cd5ac877824101bec7ea50b8ad5bffb [diff] |
am ff81427a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'ff81427a2cd5ac877824101bec7ea50b8ad5bffb':