| commit | c452e025be67787eee7ed656e765fed47ed6ae0e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 15:14:21 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 07 15:14:21 2012 -0700 |
| tree | 3129f630414629ec478c60d179c9f4477353a58e | |
| parent | b260f3531b03e09b59e0a14e4cc44749c0bf9c9e [diff] | |
| parent | 02c9991834eecb161a90475b2a2076e44628c9f9 [diff] |
am 02c99918: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '02c9991834eecb161a90475b2a2076e44628c9f9':