OSDN Git Service

Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc...
authorEino-Ville Talvala <etalvala@google.com>
Mon, 24 Aug 2015 19:22:04 +0000 (19:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 24 Aug 2015 19:22:04 +0000 (19:22 +0000)

Trivial merge