| commit | ae6c8b7a6dfb22979950d6f94146f42951bffeba | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 15:09:22 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 02 15:09:22 2012 -0700 |
| tree | c4cfa2b3e7737b731dfabc7b2fb18850522ca82c | |
| parent | 4ecfeea4b725e08151cd1071f5e0eaf7841d990b [diff] | |
| parent | 64fffa51fe4eebd2689e48b514e879748d5b9ddb [diff] |
am 64fffa51: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '64fffa51fe4eebd2689e48b514e879748d5b9ddb':