| commit | ee0463b4fa9ef09477514b6004a83c03379ff43c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:24:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:24:26 2012 -0700 |
| tree | ead74d8318633c6ed8adaafff91e130f16f9eb93 | |
| parent | aee801f692172b8d377d16f3c837f02babc6e9f2 [diff] | |
| parent | a376f22c700423e1143385d8e61341674fbf4c64 [diff] |
am a376f22c: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a376f22c700423e1143385d8e61341674fbf4c64':