| commit | 858ce51dd76a1ee30fd85c13cbb2317e1d387326 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 25 17:02:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 25 17:02:29 2013 -0700 |
| tree | 3f7f5191582c8b703dbf2076123810dc626b740a | |
| parent | bcc9536aeb5831b481723470cab3564401c58d39 [diff] | |
| parent | c5c07ac91f52da2233bbd5aa72387b419215f181 [diff] |
am 3f7fd9e2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '3f7fd9e2303c7b323c3f67ffbbae87f46587945d':