tree 129e850b0658fca902f0c61f02739f32fd5dadce
parent 3493ba2a0a2e91a093c5fddad60bc1f1e56b91b5
parent c6b9824e0da453cb8b7397078cb5782afabbe2da
author Alan Newberger <alann@google.com> 1383605720 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1383605720 +0000

Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad