| commit | f367b88acafd2c86fb766de240296ea2fba24561 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Aug 03 19:32:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 03 19:32:00 2015 +0000 |
| tree | 9d635d3c3dd47d36f6af7b9c5f718b46d3fe3f13 | |
| parent | 8b904ac9cefb03533415fd4d7b14bb0917f276fb [diff] | |
| parent | 041e10c9d751a20c9a795fd3eaac2cf2bf85f69c [diff] |
am 041e10c9: (-s ours) Merge "Add Peer-To-Peer priority mechanism" * commit '041e10c9d751a20c9a795fd3eaac2cf2bf85f69c': Add Peer-To-Peer priority mechanism