git.osdn.net Git - android-x86/packages-apps-Camera2.git/commitdiff

author	Igor Murashkin <iam@google.com>
	Fri, 18 Oct 2013 22:08:40 +0000 (15:08 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 18 Oct 2013 22:08:40 +0000 (15:08 -0700)

* commit 'd3e75bd748ce2be8fdcb30575bbde9bd07536bd3': (36 commits)
  CameraUtil: add float clamp function
  Import translations. DO NOT MERGE
  Fix build break.
  Revert "Revert "Import translations. DO NOT MERGE""
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file.
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Revert "Remove translated filtershow_strings.xml files."
  Remove translated filtershow_strings.xml files.
  Build broken.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Adding gcam module to Camera2 app.
  Refine Filmstrip gesture/position handling.
  Fix drawable location.
  ...

Trivial merge