commit | f76d558bb0ea3bbac422a90febfdb0417b5397d6 | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Mon Aug 24 19:42:49 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 19:42:49 2015 +0000 |
tree | c5a6e01463a263251f82c11a82f6d83ad0a56861 | |
parent | 5916f342a245dc2eca0c053716bf48e7f310621d [diff] | |
parent | 93826c7ebd3d5c6d6372a8bc6050d276727f7464 [diff] |
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