| commit | 122dbe96d89e8d5439cf41b92ac8b0ec435f331e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 15:45:07 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:45:07 2012 -0800 |
| tree | 6ce6b274900d5a79cd5c4a651d29667818471b5c | |
| parent | 807dc6f038b906ca52741a5768020110be53a779 [diff] | |
| parent | cc16a7efaa5346fb3876ed729bbd4d954c18df2e [diff] |
am cc16a7ef: am 75993947: Reconcile with jb-mr1-release - do not merge * commit 'cc16a7efaa5346fb3876ed729bbd4d954c18df2e':