| commit | 87ff537108c5df3241143d295d1fad3b54735365 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 15:08:59 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 02 15:08:59 2012 -0700 |
| tree | c3c559d650e9426a371b6dc47e6674b86488f927 | |
| parent | 39aa4199293bd088c48ab662850a1d5ff840607c [diff] | |
| parent | f6b165e0232c315d91c3ba2c394da27234012fd9 [diff] |
am f6b165e0: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f6b165e0232c315d91c3ba2c394da27234012fd9': JOO33 JOO32C JOO33