| commit | 47be125eca98c2a3802395d8b86234511a383fd6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:37:18 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 07:37:18 2012 -0700 |
| tree | 43610f1c7b55d3087eef3615f110d0ae616439c2 | |
| parent | 4b92af0376fa302b18476a56e26b4fde646d1d09 [diff] | |
| parent | e666ccd6ab00d689819b537e51ab9b965f8a433a [diff] |
am e666ccd6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e666ccd6ab00d689819b537e51ab9b965f8a433a':