tree 8b849f06466b4e9092b5ef5b1ba2b91e73edbabc
parent c609d527ddb60c125ea496c1fa176a5b6f7c962b
parent ebadeeabcfeb6c1ece8da62f53ecd8f884e32cee
author Nick Kralevich <nnk@google.com> 1398818965 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398818965 +0000

am ebadeeab: am f49ac52a: Merge "Remove /data/app/sensor_ctl_socket on boot."

* commit 'ebadeeabcfeb6c1ece8da62f53ecd8f884e32cee':