tree edf8d1cb9f00db681e118027dbcd0615cabd810f
parent df2c7ad4090c4822579f403ace487f8a201fa4b3
parent a6163554e8e14a7f561b94f5743ae9df2424c969
author Dmitry Shmidt <dimitrysh@google.com> 1386355212 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1386355212 +0000

Merge "Revert "Android: Handle Freq conflict in single channel concurrency case""