| commit | 3b592db88efca95d6ca995a645df963c08dd3ef2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 11:08:33 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 07 11:08:33 2012 -0700 |
| tree | 9f83275fa898476b0057790c579b29b515ab77be | |
| parent | c76fca1f02c6b7e70809723d0d6880149ca5329a [diff] | |
| parent | 7391e7a4e24c116a9aab66506f86757a2f7e74da [diff] |
am 7391e7a4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '7391e7a4e24c116a9aab66506f86757a2f7e74da':