tree ac43811a3df94d77b99192e2256d8e6c628ef903
parent b054811d5e35cf9660e2be52f96005e764c1ddd8
parent 9296aa05bcf9ca1ce665979baedd330137e8b322
author Tyler Gunn <tgunn@google.com> 1506620297 +0000
committer android-build-merger <android-build-merger@google.com> 1506620297 +0000

Merge "Fix crash issue due to NPE when two calls are merged"
am: 9296aa05bc

Change-Id: I48176f04ed13df0978e64f3f1916c3bd00fe8ee2