tree e3d72c78d1658c4d00f607f6adb2741a2560e122
parent cb326a4de9ed317aabc0d54bd1a2e14aa07e7101
parent 61c69a8119b1130db31452a0f6da218e133c7feb
author Jack Yu <jackyu@google.com> 1493759483 +0000
committer android-build-merger <android-build-merger@google.com> 1493759483 +0000

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

Change-Id: I27614ca8fe0c49538f49fb888583797ae5cf3243