OSDN Git Service

Merge \"Don\'t allow restore sessions during backups\" into nyc-dev
authorChristopher Tate <ctate@google.com>
Thu, 9 Jun 2016 23:48:44 +0000 (23:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Jun 2016 23:48:44 +0000 (23:48 +0000)
am: 9faaf5418a

Change-Id: I68e844ee0710bc4125da7789c2059ab23262ba76


Trivial merge