tree 4faeccc8459f341d1cdd93b6cd2c532327d3f1c8
parent 6f8975ddb9535b10d5aacdacb442cec571130ef6
parent 431503c11ca9e069584f70b0eef8b858a4a43546
author Zhijun He <zhijunhe@google.com> 1457485545 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457485545 +0000

Merge "Camera3Device: fix dereferencing null pointer crash" into nyc-dev