OSDN Git Service

Merge "Don\'t crash on Settings data usage" into nyc-dev
authorJason Monk <jmonk@google.com>
Fri, 29 Apr 2016 18:58:41 +0000 (18:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 18:58:41 +0000 (18:58 +0000)
commit4b32f9f5ada3f3eec32409c8188bb15e39bdea4b
treebe2c801a4eaddf4070fadbe66b040aedc820bbdd
parentcf5a448ce57883088fa7f6b3d6683065e266470f
parentb60c7560afe6c4326d9e77423b31e0dcbf452506
Merge "Don\'t crash on Settings data usage" into nyc-dev
am: b60c7560af

* commit 'b60c7560afe6c4326d9e77423b31e0dcbf452506':
  Don't crash on Settings data usage

Change-Id: I0659dc194c2fb16dda9771e9a5a7b1d3375887b4