tree e0dde35dd45a1708cd440bdb6c80bb509c54dbc7
parent 338da9c8f99de1fd70bac24971da71c32d18bd3c
parent b8660061435baa2d63036aa5720caaf79a82a9d3
author Android Build Merger (Role) <android-build-merger@google.com> 1480431203 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1480431207 +0000

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