| commit | c25961dbe45a06654b5fb26b1143c2b82a00bfb5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 18 09:46:49 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 18 09:46:49 2012 -0800 |
| tree | ac76b054dd2e2c2858f0e179c16b419f44247b89 | |
| parent | 9e83ea46b78bde4d17136a7b410e7c14955c9955 [diff] | |
| parent | efd80c92f45f5ba9c1b7912b859792bcdd9dba3e [diff] |
am efd80c92: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'efd80c92f45f5ba9c1b7912b859792bcdd9dba3e':