Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219 am: a868723467" into nyc-mr1-dev-plus-aosp

am: 149ba9af6e

* commit '149ba9af6ea6c1e3cd5aec5a7d234f7ac1c7a230':

Change-Id: I3cbc885ffbd985d3a719ea5e01f5c9bd7a12fa8d
This commit is contained in:
Wyatt Riley
2016-05-27 22:16:14 +00:00
committed by android-build-merger

Diff Content Not Available