OSDN Git Service

Merge "Fix crash when silencing condition." into oc-dev
authorDoris Ling <dling@google.com>
Wed, 10 May 2017 01:45:17 +0000 (01:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 May 2017 01:45:17 +0000 (01:45 +0000)
am: ba2f3ee3ba

Change-Id: Iee2ce7c27469008142862ab866bf53e9e02d74e1


Trivial merge