tree 5759aec6e95b43a79d0195ae7590224ea20d4699
parent e50f063530a95ae442dcad1f7e943adc1c09cea8
parent 55e5cc0ea20f1cbfe71b76b3d3975dc02e061f4c
author John Reck <jreck@google.com> 1461941834 +0000
committer android-build-merger <android-build-merger@google.com> 1461941834 +0000

Merge "Don\'t flatten nullptrs" into nyc-dev
am: 55e5cc0ea2

* commit '55e5cc0ea20f1cbfe71b76b3d3975dc02e061f4c':
  Don't flatten nullptrs

Change-Id: Iec33d48b249219e4db7fa9107e030837c7f93fc3