tree c5a6e01463a263251f82c11a82f6d83ad0a56861
parent 5916f342a245dc2eca0c053716bf48e7f310621d
parent 93826c7ebd3d5c6d6372a8bc6050d276727f7464
author Eino-Ville Talvala <etalvala@google.com> 1440445369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440445369 +0000

am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev

* commit '93826c7ebd3d5c6d6372a8bc6050d276727f7464':
  Camera: Add support for notifying NFC stack when camera is active