tree 0ea2e99ddc8f312ef4180d10b984b62bc19e6826
parent eb62f7f3e4db327366774d5527c56f215a7c9281
parent 24ca5c6d7da534dd529421ccdb45447c90063108
author Todd Kennedy <toddke@google.com> 1458230302 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458230304 +0000

Merge "update "dont kill" api" into nyc-dev