tree e65af2142771b7803c452fc2695e81d4a7f70afc
parent 594173a8bbce608a8d81d1ad051fb76c10545989
parent 4f59edb63fa1032968cbbfab545bad687cb45321
author Tobias Thierer <tobiast@google.com> 1509457886 +0000
committer android-build-merger <android-build-merger@google.com> 1509457886 +0000

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

Change-Id: If74e0f6783bb38c707a3575821255e8f1ec4d78f