| commit | 42d44e3d5280544f42e58b11de13f44c72411f59 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 14 12:44:56 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 14 12:44:56 2012 -0800 |
| tree | cd9d04a8fe592e44153728e07d1f7eba1136cd89 | |
| parent | f1c3ffe5f0cbf33041cfa9c3d6333ee08fbf2802 [diff] | |
| parent | 11dd4b998dfadf5a7eeaec5228cfb6100c855608 [diff] |
am 11dd4b99: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '11dd4b998dfadf5a7eeaec5228cfb6100c855608':