| commit | 51caf4d4f4c682d16befe1aee8344abdeb52da0f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:24:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:24:41 2012 -0700 |
| tree | 1fec4897f43973c7eeed36a3a7e466058638e94f | |
| parent | 76eedf59616298c7fd48737155b8671692822bbe [diff] | |
| parent | d6fdf150afc09d21fe9400bc9b010d7638de6fc5 [diff] |
am d6fdf150: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd6fdf150afc09d21fe9400bc9b010d7638de6fc5':