| commit | 2b556bc988161cdbbbdbae8db227a118a6a6f392 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 09:49:34 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 09:49:34 2012 -0800 |
| tree | 69654c790917913b464ed59c26070655abe5a20f | |
| parent | e402f1fde2deca0b1120e6d582ab9dce59879ae1 [diff] | |
| parent | 6d93da465ab8fff02728f268785e59ab86a2a0c2 [diff] |
am 6d93da46: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '6d93da465ab8fff02728f268785e59ab86a2a0c2':