| commit | 1483631c2f1fdacafd5b1c5c8c73721e21e2174b | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri May 10 16:16:30 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 10 16:16:30 2013 -0700 |
| tree | 2365f8809cd10269293d9ecae55f8dade41f4115 | |
| parent | 9926960d13cc98aa5f02b652fc3f132166d08895 [diff] | |
| parent | a62fbd31b38d95817ebd65118e4c7ef2d82bc2ee [diff] |
am a62fbd31: am 408ad99d: Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails." * commit 'a62fbd31b38d95817ebd65118e4c7ef2d82bc2ee': frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.