From: Alan Newberger <alann@google.com>
Date: Mon, 6 Oct 2014 22:35:20 +0000 (+0000)
Subject: am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
X-Git-Tag: android-x86-6.0-r3~68^2~30^2~5^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0424d26413389555335ac941de632a1afa1485b7;p=android-x86%2Fpackages-apps-Camera2.git

am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev

* commit '0ac0b733d510fc17d072c61055c0e2ad446689ff':
  Fix incorrect key translation in Settings refactor
---

0424d26413389555335ac941de632a1afa1485b7