| commit | dcc80c139562ee611c9aac94529553e936346866 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:06:09 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 15:06:09 2012 -0700 |
| tree | c5743ae7eee028a3c68220151a26c1728b3ba617 | |
| parent | 9abcf50691c1e220889a9373c15aeaea66e84586 [diff] | |
| parent | c2300d841afeb33f64cc9a3896bbbdf4bd39e62a [diff] |
am c2300d84: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c2300d841afeb33f64cc9a3896bbbdf4bd39e62a':