| commit | c6bb3c6d9f90a453b7869d7291178a944341546d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:08:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 08:08:08 2013 -0700 |
| tree | 4bc109d6989a5f85b01da0ad740f2ac247aa18cf | |
| parent | b5d514b7bbb4d4d66427c64d811e552eebc08454 [diff] | |
| parent | 044f46062a220f33eaeb1a1045f1c50a8bc9a10f [diff] |
am 044f4606: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '044f46062a220f33eaeb1a1045f1c50a8bc9a10f':