tree 3862929c162ea27074f3cf1721236dd30882c1e4
parent e61df5503ff2c2533b0f75eb50b0d2fce592b89a
parent 073a48ef6f0437c4e609cde416c171c9e2766528
author Elliott Hughes <enh@google.com> 1475548430 +0000
committer android-build-merger <android-build-merger@google.com> 1475548430 +0000

Merge "sed -i run as root wasn't preserving ownership." am: 20197847d8
am: 073a48ef6f

Change-Id: I22d2f9572297bf648ba4842fc5b23b539e757fac