| commit | f62c01c0843dc6686a9add82bfcf5907a031bfb5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 02 07:30:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 02 07:30:19 2012 -0700 |
| tree | d3260d11085c9cef5f259ba0b98be674b38bfc05 | |
| parent | a08bbc567a2477eb292ac27153f62b165bd2bed9 [diff] | |
| parent | 1273f1b7ace1772bc115f4252f2925de0c5c102d [diff] |
am 1273f1b7: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1273f1b7ace1772bc115f4252f2925de0c5c102d':