| commit | 7919fa2c33b1fa7f5e49b2188d671bfe519c231e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 25 17:02:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 25 17:02:16 2013 -0700 |
| tree | cff1198ade127c231b63935ef66605614f79b957 | |
| parent | 414abc556454c2e17f7e7ec72d08d4ec798cd4df [diff] | |
| parent | bdebd4817cfe49fafedfe8f9c65930e03f9b508b [diff] |
am bdebd481: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'bdebd4817cfe49fafedfe8f9c65930e03f9b508b':