tree 0c4170b2461f57d354f8fac12fbcdf4891a1ee7b
parent 17a527f267c01895ea7397e122215b7c4a669d0b
parent 45f8aaca7c0fb8e643a35c7e5fbaf5b8d02480ba
author Wale Ogunwale <ogunwale@google.com> 1467045119 +0000
committer android-build-merger <android-build-merger@google.com> 1467045119 +0000

Merge \"Reset relaunching count is app dies during re-launch\" into nyc-mr1-dev
am: 45f8aaca7c

Change-Id: I4de3c56e1745371c453f983e95d49a7c59a3c694