| commit | f03d602850a95888c10df99e594ada7b537388f9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Sep 24 10:18:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:18:41 2012 -0700 |
| tree | 8771dbb24dd994b26b887d047abf070079ef7cdd | |
| parent | 3568a617465cc33e6d9e3dbab84a233c72b20e71 [diff] | |
| parent | 9b87fd644574d94d962baf5671d7dc4641dda492 [diff] |
am 9b87fd64: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9b87fd644574d94d962baf5671d7dc4641dda492':