Android: Check KHX, GOOGLE, and ANDROID extensions am: 5d9562a8c6 am: efd1deb8d7
authorPyry Haulos <phaulos@google.com>
Fri, 3 Feb 2017 22:58:25 +0000 (22:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 22:58:25 +0000 (22:58 +0000)
am: e6d5552bb8

Change-Id: I5d7b4c0948ee9e69be0d6e67d8c402cf1317bbdc


Trivial merge