| commit | cf5dd91ec796abad8f6464687439c47f5a86f3df | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:08:09 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 08:08:09 2013 -0700 |
| tree | effa22031f55a3260979ca2776a36e59c55fc634 | |
| parent | ceb1f0af56b5ff1f546438ec27321929956c705f [diff] | |
| parent | 0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c [diff] |
am 0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c':