tree 690e81df41b95288c605198cf027db1d174d331a
parent 7f2c48843e2395ca90ad5882c8fb518f60982e3f
parent 055305005cf90a25437cc0f88e4087633e7d529f
author Michael Kolb <kolby@google.com> 1367871745 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367871745 -0700

am ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce

* commit 'ea75136ae4abf55070644e5a048cf44323517c43':
  Fix lockscreen camera widget layout