| commit | 47055bfdd3de5a5677b3411256fa77494aa7aa12 | [log] [tgz] |
|---|---|---|
| author | Wei Wang <wvw@google.com> | Tue Jul 11 19:59:40 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 11 19:59:40 2017 +0000 |
| tree | 66d0d3c16719da49d00bdf67c63293c2f0855885 | |
| parent | 334617e07939fff4a5ce883a393146999643adac [diff] | |
| parent | 546aa9b19bf923cc693e6940c2ec6fe63b3a1500 [diff] |
Merge changes from topic 'svcmgr_shutdown_critical' into oc-dr1-dev am: 5ebcaf1bb0 am: 546aa9b19b Change-Id: I4fb053426ef70e6012ee47797d2a368bdf633ba9