| commit | b5470ed80a1239d2bd35cff987b3ae99470bf84f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:22:51 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:22:51 2012 -0700 |
| tree | 5fb81b7903eba34ce745717c48424e0caee7bf50 | |
| parent | 18921e33160cea329dfd0eafba32c102f8fff064 [diff] | |
| parent | 79a1f577bda98d7fe4c67aac110da226530d6e76 [diff] |
am 79a1f577: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '79a1f577bda98d7fe4c67aac110da226530d6e76':