tree 7bf4eac2f8e47c6671d67281758d1143ab2013aa
parent b0c6b03c938b48e25af5abc54362a060cc3f068f
parent 041e10c9d751a20c9a795fd3eaac2cf2bf85f69c
author Martijn Coenen <maco@google.com> 1438595212 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438595212 +0000

am 041e10c9: Merge "Add Peer-To-Peer priority mechanism"

* commit '041e10c9d751a20c9a795fd3eaac2cf2bf85f69c':
  Add Peer-To-Peer priority mechanism