tree 00324a83495af84a7ada907b878f8698d2c9568f
parent 52277efa6cb0a4e87bdcf8b027f16f694f950281
parent ef4267e53aec6e99fe9b672e94cb20a33dcf20e8
author Mark Lu <Mark_Lu@htc.com> 1480430597 +0000
committer android-build-merger <android-build-merger@google.com> 1480430597 +0000

Merge "[AM] Fix system server may killed when monkey crash." am: 21ed56daac
am: ef4267e53a

Change-Id: I829756bc1b6277abd77a86e8e6a0e895bb55db80