OSDN Git Service

Merge "Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af am...
authorJason Monk <jmonk@google.com>
Fri, 29 Apr 2016 19:03:16 +0000 (19:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 19:03:16 +0000 (19:03 +0000)
am: b5cbaa27f7

* commit 'b5cbaa27f7bca6321760e757c8cb3135e1518446':

Change-Id: Iccb72b39c82b583feb7bd97b9801b48a1ad6925a


Trivial merge