Learn more about cloning repositories
You have read-only access
Manual frameworks/base merge from lockhotness (camera). Change-Id: I8649ef77b706120a2297ddccd9bbb4d7ddf026a9 Proto-Id: Ia60ed9ee263b6053b9ca00d71fbd3ffc64a96278
