| commit | 5960d76855d6faf3b39359842f8eb282f9f271a0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 10 09:47:46 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 09:47:46 2012 -0700 |
| tree | 5c3172b9b68cf16afc245fb5e5d8cbfb9587e514 | |
| parent | 113d4abd96abd8172bc961d0e365ad59498d33c2 [diff] | |
| parent | f97af999b91122116b953d1f06b48c00e18a4531 [diff] |
am f97af999: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'f97af999b91122116b953d1f06b48c00e18a4531':