tree a0b1ca3e2c66f8a3eb4521363f50dc570e67209e
parent 0fd90c00c9757de8ac452470509859d8c11f291c
parent 8bb5c93feefadc59113b1c4f040e11a6a05feef5
author Geoffrey Pitsch <gpitsch@google.com> 1490306065 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1490306070 +0000

Merge "Add null check on serviceinfo"