OSDN Git Service

Merge "Don\'t crash if the backup transport supplies bogus intents" into nyc-dev
authorChristopher Tate <ctate@google.com>
Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)
commitecd0f417efdda8a4ff18f60733be3813285c3dff
treee7247c671f322c3130303e924799d54f31a9e6e3
parent5dfe72854f75ba5cf319fd8d3e0ea8d2d4fb31d6
parent8b90b39c5e222abecd57cc89ccfbca36f52fc38f
Merge "Don\'t crash if the backup transport supplies bogus intents" into nyc-dev
am: 8b90b39

* commit '8b90b39c5e222abecd57cc89ccfbca36f52fc38f':
  Don't crash if the backup transport supplies bogus intents