tree 0353b143900925979d7842c38d065a03de372eff
parent a404b8ad842ccb0bed26c8e284da237ce12d74de
parent f880d1f9af52f4c3a2ee550af9770730f2079977
author Makoto Onuki <omakoto@google.com> 1500919678 +0000
committer android-build-merger <android-build-merger@google.com> 1500919678 +0000

Merge "Don't keep parceled extras for history broadcasts." into oc-mr1-dev am: 4fdefef7a1
am: f880d1f9af

Change-Id: I269a85d171d636c4286b6ed4fdc3393e09c8162b