| commit | 5c610497a8fb49f8d1a77d3074d35f157cbb1cea | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 16:41:16 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 03 16:41:16 2012 -0800 |
| tree | b13d2f89aed526f0e40a8b90be386b47f0b84be6 | |
| parent | f057fea5b9f59e1b08adea4a663acae95fc4ff64 [diff] | |
| parent | b04fea024358435114427d53ef2bbff7cf07db7c [diff] |
am b04fea02: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'b04fea024358435114427d53ef2bbff7cf07db7c':