| commit | 2b44a5632613fc99671dae50c5e32f3dbc2aeaa7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 10 09:45:39 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 09:45:39 2012 -0700 |
| tree | c3c3d35ebb06e219bf41460f70c98ebd6ee828d3 | |
| parent | 44df5c8692d37e2d5e729b52b908e1a49df83a84 [diff] | |
| parent | d0d4d44d344779e59ee196637bbc745d68d70677 [diff] |
am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'd0d4d44d344779e59ee196637bbc745d68d70677':