OSDN Git Service

Merge "Add flags to emergency info intent" into nyc-dev
authorMaria Garcia Puyol <mariagpuyol@google.com>
Mon, 28 Mar 2016 21:56:59 +0000 (21:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 28 Mar 2016 21:56:59 +0000 (21:56 +0000)

Trivial merge