tree 6c13f9e0408a104c0b864602976080e2f48fd899
parent 076efc0354552ee3b0845ae3b5988e755f92d5b0
parent b0c36b235198d6d9a38bf13f39aa25359aac9b1a
author Alan Newberger <alann@google.com> 1409248719 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409248719 +0000

Merge "Actually remove settings" into ub-camera-glacier