| commit | d8af57f8c2715dd06f49f6003afa2f41437fefa3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:25:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 12 07:25:58 2013 -0700 |
| tree | a97230dad546b2bcd9ed63e6ff2c33e69040f56c | |
| parent | 52b943e8036aa6ebd15131820d196fedb321613d [diff] | |
| parent | 765f99f30fdc18396ce4edc9facbe6632c9b858e [diff] |
am 765f99f3: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '765f99f30fdc18396ce4edc9facbe6632c9b858e':