| commit | c2b87dd92f621cdd500fc0e759be680a30815578 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 03 13:28:34 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 03 13:28:34 2012 -0700 |
| tree | 931bfc7ccdd83a8a91168adf88a3e513f0c62857 | |
| parent | a56e96edfb9af68df76bacfd6862ed0879ac037b [diff] | |
| parent | b78b24e1bf8a1195fd038c874561db80ea2214c5 [diff] |
am b78b24e1: (-s ours) am fa3c2d9a: am ad808f5d: (-s ours) Reconcile with jb-release - do not merge * commit 'b78b24e1bf8a1195fd038c874561db80ea2214c5': JRO03L JRO03K JRO03J JRO03I