diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-08-15 12:36:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-15 12:36:43 -0700 |
| commit | db7f9f38428db55cd00554016f58fe78c714059e (patch) | |
| tree | 1c071b89cfb2c114f1a98bf8d3a95b8a17e981b1 /core/java/android/annotation/StringDef.java | |
| parent | f4e2e651b37e4bf2bcd1dfb19b02ee892ed263e7 (diff) | |
| parent | 0d8afa2ea314c142320bf921f81540a37561f6eb (diff) | |
am 0d8afa2e: Merge "wifi: Send event without prefix to p2p0" into klp-dev
* commit '0d8afa2ea314c142320bf921f81540a37561f6eb':
wifi: Send event without prefix to p2p0
Diffstat (limited to 'core/java/android/annotation/StringDef.java')
0 files changed, 0 insertions, 0 deletions