tree cafa51b59f93c7e732f7d079996b92d4f9ba069b
parent 5a31605a034e990a68567597bbf9ccbc8cb28494
parent 20dc49235e213d40f75dca9005e0e248931ceff4
author John Spurlock <jspurlock@google.com> 1383774918 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383774918 -0800

am 20dc4923: am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev

* commit '20dc49235e213d40f75dca9005e0e248931ceff4':
  Fix lockscreen camera preview position in RTL.