tree a0a976b8680292227ff3c640617337f9b7b71f34
parent 1e6a0caab05da8c7c36cd9051f2d8b56f8d17488
parent 8ae1dffe73609570ce73ab5430111a3d47400fb8
author Erik Kline <ek@google.com> 1499324583 +0000
committer android-build-merger <android-build-merger@google.com> 1499324583 +0000

Merge "Trim OWNERS" am: 204461a170
am: 8ae1dffe73

Change-Id: If2737e3cc8c252bb81abc22b0db31468824d5ead