tree 0a6f3175dbd096b074341bf29c411433a35e7ad7
parent 4b278afa0dcfb7423054dca8a907a4895ef91134
parent 92e565f71526141cb38f864dcb4eeb54d2cbf869
author RoboErik <epastern@google.com> 1409946342 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409946344 +0000

Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev