tree b1153e8bda134a3f58293537ba94a71328c212a4
parent 2f1cb548ba299b0bd69c62f5c159437bfb244266
parent b519569eb30cbda364ddef39bd55cef8f8e202d2
author Tobias Thierer <tobiast@google.com> 1509457294 +0000
committer android-build-merger <android-build-merger@google.com> 1509457294 +0000

Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"
am: b519569eb3

Change-Id: Ib9099673a4b643b10f38a0c94ddea49949f796eb