OSDN Git Service

Merge "Don't crash settings when out of space." into nyc-dev
authorJason Monk <jmonk@google.com>
Fri, 29 Apr 2016 17:54:33 +0000 (17:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 29 Apr 2016 17:54:34 +0000 (17:54 +0000)

Trivial merge