| commit | c1d6374aed994ac68b010e5118f5256d645192c1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 07 07:56:34 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 07 07:56:34 2012 -0800 |
| tree | 334165a1e11655f8a710b8deeb6ed1d5c71bc0f7 | |
| parent | fec83fe557fdb8244ddd33388849bcd1092afa05 [diff] | |
| parent | f33c33097bafd263ec1c1fe1515c42f8569a6e1d [diff] |
am f33c3309: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'f33c33097bafd263ec1c1fe1515c42f8569a6e1d':