tree cf597b084e866613ad36d442c07ff63e4593c627
parent 2ebea210749dc2f035111266b61bcffd94556f9b
parent 7b39349792b6f32c9349307033d7c11563d86b5f
author Hugo Benichi <hugobenichi@google.com> 1486018357 +0000
committer android-build-merger <android-build-merger@google.com> 1486018357 +0000

Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e
am: 7b39349792

Change-Id: I3d475b36e505e402d18a3942f557e2823d21416f