tree a3a7ea835d2eedc640adcdc6a1b846772c9f3e48
parent 79d159f7acb73a72ab63e6b147cc369780329deb
parent b96b02e50b9fedefca6df44b259c0f7d5d403553
author Elliott Hughes <enh@google.com> 1517002313 +0000
committer android-build-merger <android-build-merger@google.com> 1517002313 +0000

Merge "Update our status in light of recent additions."
am: b96b02e50b

Change-Id: I178b29fae3f4b2768356d5fc23fe49d7f020cf7f