tree 7d8c6550c7a163e38ac255ff6912f74125c50054
parent fd1b667c942f564dd011cf5c3c4478fd8ffa61db
parent c8278f35c746a946b72b3a852e43fb6b307e0a4f
author Selim Cinek <cinek@google.com> 1484694188 +0000
committer android-build-merger <android-build-merger@google.com> 1484694188 +0000

Merge "Not allowing foreground services to be cleared as children" into nyc-mr2-dev
am: c8278f35c7

Change-Id: Ic6cccd4760d102a1b69f664a99eb114d006f3d45