diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-08-24 19:27:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 19:27:42 +0000 |
| commit | f2c5ce5db149e320299896b1afdcb7c63378663d (patch) | |
| tree | 61b3966bc49f48a9926f0ebf66f467c73e75c39c /tools/aapt2/diff/Diff.cpp | |
| parent | 7fd1014f093258d820e15dc9814e5aaad579bafb (diff) | |
| parent | a42cf680a57e73eb4ed874bb78b7f47c6d5d76d3 (diff) | |
am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
* commit 'a42cf680a57e73eb4ed874bb78b7f47c6d5d76d3':
Camera: Add support for notifying NFC stack when camera is active
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions