| commit | 796050d1444af88154ac02ec0106c5bc8b2762f1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:34:08 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:34:08 2012 -0800 |
| tree | 4c6025d84f5c768918b114fb59be82718a87f0a5 | |
| parent | 5f2fa6b82cbb6714ab2996aebc16f10c62d0e673 [diff] | |
| parent | ef51f33e544577c8fbc802a5623bef87d97473b8 [diff] |
am ef51f33e: (-s ours) am 4d095547: am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'ef51f33e544577c8fbc802a5623bef87d97473b8':