OSDN Git Service

resolve merge conflicts of 934747d to nyc-dev-plus-aosp
authorAyan Ghosh <abghosh@codeaurora.org>
Mon, 30 May 2016 23:34:18 +0000 (23:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 May 2016 23:34:18 +0000 (23:34 +0000)
commit4c873f135e3e3b321bc3261d222395348be86e57
tree76d6442bc8fb38856233349737055dc3bd47203a
parent541560136f9e4b973ec46d1b489f44520f9c1623
parent6efca2e76bb58f2949d93cbd7f5a9cb0dc276f9a
resolve merge conflicts of 934747d to nyc-dev-plus-aosp
am: 6efca2e76b

* commit '6efca2e76bb58f2949d93cbd7f5a9cb0dc276f9a':
  Limit number of SBC frames to fit into single MTU

Change-Id: I01721148de302de9d4bb0bfcb12b0fc6a4b10cd3