OSDN Git Service

Merge "Show emergency info preference for all users" into nyc-dev
authorMaria Garcia Puyol <mariagpuyol@google.com>
Thu, 18 Feb 2016 21:04:38 +0000 (21:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 Feb 2016 21:04:38 +0000 (21:04 +0000)
am: adcec744b2

* commit 'adcec744b2699a54db5606e9a50a08c6fb243a0e':
  Show emergency info preference for all users


Trivial merge