| commit | 29c1c322892b17c965fc19a254e84bba4f3123fe | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 27 17:33:35 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 17:33:35 2012 -0800 |
| tree | 4377e3dcadcfbda9d688f0db9ea250c321a40b60 | |
| parent | 77282e3805ee2be7fd48291b85e1269dc1e5755f [diff] | |
| parent | ac678eb7b509b1b03c6a5cd13e1a060660af73d3 [diff] |
am ac678eb7: (-s ours) am 4851b052: am 8ef1e64a: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'ac678eb7b509b1b03c6a5cd13e1a060660af73d3':