tree 8d83933ef53bf0dfea0ee2783e71fb64a12fa437
parent c133f3619f3ae268bf63bb7105dcb22ae425548d
parent b2fbff1f8e01e95357b0db90bc98bfa18349adaa
author Jack Yu <jackyu@google.com> 1493761121 +0000
committer android-build-merger <android-build-merger@google.com> 1493761121 +0000

Merge "Fixed crash when broadcasting any data intents" am: 5b72ca6b8e am: a60a78a286 am: 61c69a8119
am: b2fbff1f8e

Change-Id: I969634a64ab09c5fe3672d96a44554de86fd4948