tree 312c171cc5afc429c410ff580b77a423ef4d0aa0
parent 1935663248f9c84ce3f1fd8f9a9b15b0e38ddc70
parent 359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5
author Dmitriy Ivanov <dimitry@google.com> 1415036284 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415036284 +0000

am 359d58dc: resolved conflicts for merge of cb8c583d to stage-aosp-master

* commit '359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5':
  Fix ps <process name>