OSDN Git Service

Merge changes from topic 'llndk_rename' into oc-dev
authorSteven Moreland <smoreland@google.com>
Tue, 11 Apr 2017 07:42:21 +0000 (07:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 07:42:21 +0000 (07:42 +0000)
am: c441fbfe43

Change-Id: I3a33c345c85b5d84a1e363ce471ffd729b340a16


Trivial merge