[automerger skipped] Merge "Rename ProcResult stdout and stderr fields" am: cb8f9e3429 -s ours am: 79e1c12dd3 -s ours am: b19ac11b15 -s ours am: f748baeb6e -s ours
am skip reason: Merged-In I04770d2d6e82ca8393308ab12a304838a80f0ae5 with SHA-1 faa5e27652 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1797190
Change-Id: I67454868d090f7428046e909869734f40417204d
This commit is contained in: