| commit | 7cbaea4f1495b2e8232150807d69b129917f4c55 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Aug 03 09:46:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 03 09:46:52 2015 +0000 |
| tree | 7bf4eac2f8e47c6671d67281758d1143ab2013aa | |
| parent | b0c6b03c938b48e25af5abc54362a060cc3f068f [diff] | |
| parent | 041e10c9d751a20c9a795fd3eaac2cf2bf85f69c [diff] |
am 041e10c9: Merge "Add Peer-To-Peer priority mechanism" * commit '041e10c9d751a20c9a795fd3eaac2cf2bf85f69c': Add Peer-To-Peer priority mechanism