OSDN Git Service

Merge \"Made severe and extreme alert configuration dependency configurable\" into...
authorJack Yu <jackyu@google.com>
Wed, 20 Jul 2016 01:06:25 +0000 (01:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 01:06:25 +0000 (01:06 +0000)
am: 338566df68

Change-Id: I90c0669c74e15d92d00a639ad444866142a62c2e


Trivial merge