OSDN Git Service

Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com" am: b5195...
authorTobias Thierer <tobiast@google.com>
Tue, 31 Oct 2017 13:51:26 +0000 (13:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 13:51:26 +0000 (13:51 +0000)
am: 4f59edb63f

Change-Id: If74e0f6783bb38c707a3575821255e8f1ec4d78f


Trivial merge