| commit | 404ac536423f38e04994e5ffc705646219d8202a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 03 13:58:05 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 03 13:58:05 2012 -0700 |
| tree | 931bfc7ccdd83a8a91168adf88a3e513f0c62857 | |
| parent | c2b87dd92f621cdd500fc0e759be680a30815578 [diff] | |
| parent | fa384c7f751ba9320c65ce9a62fbe3007bca3315 [diff] |
am fa384c7f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'fa384c7f751ba9320c65ce9a62fbe3007bca3315': JOO33B take two add extra args to mkbootimg JOO33B JOO33 take two