OSDN Git Service

Merge "Fix storage settings crash." into oc-dev
authorDaniel Nishi <dhnishi@google.com>
Fri, 14 Apr 2017 22:41:30 +0000 (22:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 22:41:30 +0000 (22:41 +0000)
am: 496fb93060

Change-Id: I76354ceb7c6e87bc3b0ee845a2c95e46c3569f21


Trivial merge