tree e812b89a355e102bd545da16e9e9cdffa5f8c98d
parent 4b331cc15487ca44926eb3ae55e2f42cd4736cad
parent de671ad0e6272b1746559df8184a7ca431344c1b
author yuanhuihui <yuanhuihui@xiaomi.com> 1475081271 +0000
committer android-build-merger <android-build-merger@google.com> 1475081271 +0000

Merge "fix persistent process is killed and restart again and again" am: ae302cef52 am: b322dc384e am: 20a5fe414e
am: de671ad0e6

Change-Id: Ic4dbc59df650a9477e97620091abb685a1fd2bc4