OSDN Git Service

Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev
authorBeverly <beverlyt@google.com>
Fri, 18 Aug 2017 14:13:20 +0000 (14:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 Aug 2017 14:13:20 +0000 (14:13 +0000)
commit7ba9e9f849d4e2adeaff3e7050c8f24fac52ada4
tree5de3671072a62419c28819d059747dbb6c12a4cf
parent2d9251f32faac6bc214a826f539a9b933c3b1338
parent268c6c6ca66cb9656f921a72355637821e1d6ec8
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev
am: 268c6c6ca6

Change-Id: Ie87db0cde5fe606c31d4cfd3540adafdd98147ac