| commit | 4041332fc772dec70b709d0e0b12c178b5f7638e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:38:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 10:38:54 2013 -0700 |
| tree | d0c2797379a505fc33b006c36036df0454847cf7 | |
| parent | 86658eea6f8b1f0c31c0642e8d226dc82e5d32e7 [diff] | |
| parent | edb073efd3c4cee5595f5692b22a69a1e3bc89fe [diff] |
am edb073ef: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit 'edb073efd3c4cee5595f5692b22a69a1e3bc89fe': Flush QemuPipeStream when needed