OSDN Git Service

Merge "Take a wrench to the pipes" into oc-dr1-dev
authorJason Monk <jmonk@google.com>
Fri, 14 Jul 2017 21:40:36 +0000 (21:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 21:40:36 +0000 (21:40 +0000)
commitbcfe19ebe89234eb081361a17dfeb44d68977a54
tree071c6d08293b0e1d70d63e8c696cf3e15f4394b5
parentd0ee6987e1daf09edd741e5f252f3660b8c90ca7
parente1036c93a06fcd773b03fb56aa699452f5428a3c
Merge "Take a wrench to the pipes" into oc-dr1-dev
am: e1036c93a0

Change-Id: I1a4606bc6996df2aa4b67645fbb06f0c2b46cd5c