commit | eecb302cf86b09488003e1428aa5319cc472c8ed | [log] [tgz] |
---|---|---|
author | John Reck <jreck@google.com> | Fri Apr 29 15:05:06 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 29 15:05:06 2016 +0000 |
tree | 3956a7848bd4cff2e15a9d0c38433f29b0c1cd10 | |
parent | c28ee4857b8bfe683ddeaf8eaeb89527ecfd04f0 [diff] | |
parent | d6c480efb4fa5d4ca8cedef5ccec4bf763d467ba [diff] |
Merge "Don\'t flatten nullptrs" into nyc-dev am: 55e5cc0ea2 am: d6c480efb4 * commit 'd6c480efb4fa5d4ca8cedef5ccec4bf763d467ba': Change-Id: I7e68cd1d4a0eb3c9ec2e7eb62b3bd881fbe3df8a