| commit | cb221a5cbe5599d4f2941d332fbdb26e8575d605 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 10 08:53:33 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 10 08:53:33 2012 -0700 |
| tree | 1a39c823327d71e7b9d69f5620e07c227a72f724 | |
| parent | 444a2bf314991862bb82ba38f7fb90c2278c93cc [diff] | |
| parent | 1551f18af0c75c2b2c3ca61168fe4284b54f1a2e [diff] |
am 1551f18a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1551f18af0c75c2b2c3ca61168fe4284b54f1a2e':