| commit | b8079c5c49e998779d82abd4c19fef99a6705b84 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Mon Aug 24 23:39:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 23:39:22 2015 +0000 |
| tree | b2245b7508cb14ec071aa3f1221964c668b4a6d7 | |
| parent | 09adb49eda542f7c2395bf0ab0decc4eb495e66e [diff] | |
| parent | f76d558bb0ea3bbac422a90febfdb0417b5397d6 [diff] |
am f76d558b: am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev * commit 'f76d558bb0ea3bbac422a90febfdb0417b5397d6': Camera: Add support for notifying NFC stack when camera is active