OSDN Git Service

Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev am: 268c6c6ca6
authorBeverly <beverlyt@google.com>
Fri, 18 Aug 2017 14:19:20 +0000 (14:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 Aug 2017 14:19:20 +0000 (14:19 +0000)
commitf1e4e4fdd3e0adbe8a5f80d60a82c5ef44b485b9
tree375c6ed60e4a4a62babe99f30cdfadf50c108b60
parente576f0393e6d54b02f9d00a88e29a64cbc83dc18
parent7ba9e9f849d4e2adeaff3e7050c8f24fac52ada4
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev am: 268c6c6ca6
am: 7ba9e9f849

Change-Id: If4c8fa69fcc6b7be28a41ef8d51ffa463af19741