| commit | a978261764bdc18224c67d2f699945c8e598d4f0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:40:06 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:40:06 2012 -0800 |
| tree | 152b501788a5279f3baf903dacdd35be984816d0 | |
| parent | 559b30a10ef57d318caa22c336d912ffc03a6970 [diff] | |
| parent | 56b45f79ba56644dff55c19459dbd59bc6850e9a [diff] |
am 56b45f79: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '56b45f79ba56644dff55c19459dbd59bc6850e9a':