diff options
| author | Etan Cohen <etancohen@google.com> | 2016-09-30 20:45:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-30 20:45:02 +0000 |
| commit | e3d5fa1094ecc9edd1c71b002ca4436d327c42eb (patch) | |
| tree | f96f5b0c96f06ee5d6c5dccb715aadcfc7011e40 /libs/androidfw/AssetManager.cpp | |
| parent | 42d25b5992c6c5967ca7d82001bc0e415f2887a6 (diff) | |
| parent | 720d175757f30ff7546309031a8e60f71f5387ee (diff) | |
Merge changes from topic 'cherry-pick'
* changes:
[NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
[NAN] Update API javadoc to clarify NAN status change broadcast scope
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions