| commit | 3e5d85bbf5702486032f379f73d194745073e50f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 02 07:30:21 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 02 07:30:21 2012 -0700 |
| tree | 88ac54041e8b6639057ee2362b88ea6e0831bfc2 | |
| parent | edfc9b380f41887b5382e795e1985e6d57440885 [diff] | |
| parent | 70733220a7d61da44c6465f51154bb8e73b34f15 [diff] |
am 70733220: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '70733220a7d61da44c6465f51154bb8e73b34f15':