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