OSDN Git Service
Sascha Haeberling [Wed, 25 Jun 2014 18:05:49 +0000 (11:05 -0700)]
Ensure focusAndCapture() is called on the main thread.
Bug:
15863231
Change-Id: Ieeb6e61e5a8a1d49832ea8ded6de2575afb0bdad
Baligh Uddin [Wed, 25 Jun 2014 02:51:59 +0000 (02:51 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Andy Huibers [Thu, 19 Jun 2014 05:26:14 +0000 (22:26 -0700)]
Add metadata to capture and tap to focus events.
Bug:
15646701
Change-Id: Id290935839a81cfe86e9a503849207d828f33225
Andy Huibers [Mon, 23 Jun 2014 23:31:56 +0000 (23:31 +0000)]
Merge "Add maximum zoom level and time to view events." into ub-camera-fishlake
Erin Dahlgren [Mon, 23 Jun 2014 22:17:07 +0000 (15:17 -0700)]
Hard reset HDR off if HDR+ is supported.
HDR and HDR+ should not be activatable on the same phone.
Our app depends on this assumption, so in case the app is killed
in some way to prevents us from going to gms core to get the
right information about hdr/hdr+ support, force HDR off if HDR+
at any point is supported.
Bug:
15310749
Change-Id: I450671d1218679ac8d413a01c5857030ba6ea32a
Andy Huibers [Tue, 20 May 2014 22:17:06 +0000 (15:17 -0700)]
Add maximum zoom level and time to view events.
Bug:
15646701
Change-Id: I7c1de761fc10486b417a25ebc8469cebaf840a1c
Sascha Haeberling [Mon, 23 Jun 2014 20:34:24 +0000 (13:34 -0700)]
DO NOT MERGE - Remove Material from Fishlake. But not glacier.
Bug:
15757384
Change-Id: I3367a96e1059ab4e0f2fc65353a13853a33767ca
Baligh Uddin [Mon, 23 Jun 2014 19:39:43 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib47ffbe27c9f6a559677c77ad94cf6d2b2e9ed1b
Auto-generated-cl: translation import
Sascha Häberling [Fri, 20 Jun 2014 23:49:20 +0000 (23:49 +0000)]
Merge "Revert "Memory window analysis in Camera2. Bug:
13280671"" into ub-camera-fishlake
Sascha Häberling [Fri, 20 Jun 2014 23:45:29 +0000 (23:45 +0000)]
Revert "Memory window analysis in Camera2. Bug:
13280671"
This seems to introduce jank in the app.
This reverts commit
b4f3483bfb5c2edcaefd0b44e84bb080e46502c8.
Change-Id: Iad87e32a411eae1e2fdf09d6829c0e006a8eb5f8
Erin Dahlgren [Fri, 20 Jun 2014 21:58:18 +0000 (14:58 -0700)]
Protect settings logging with a verbose flag
Change-Id: Icacc7c01971ed2077b9e5999e042a2b9ba031cfd
Erin Dahlgren [Fri, 20 Jun 2014 19:30:56 +0000 (12:30 -0700)]
dump default and global shared preferences
Change-Id: Ia9f3780dc6a0725badb3214fc9388fab9007dbb5
Kevin Gabayan [Thu, 17 Apr 2014 20:56:10 +0000 (13:56 -0700)]
Memory window analysis in Camera2.
Bug:
13280671
Change-Id: I22249e6aeb76dca2fe79e49d3bd75c089fa7936f
Kevin Gabayan [Thu, 19 Jun 2014 21:28:06 +0000 (21:28 +0000)]
Merge "Memory window analysis in Camera2. Bug:
13280671" into ub-camera-fishlake
Baligh Uddin [Thu, 19 Jun 2014 19:15:49 +0000 (19:15 +0000)]
am
0e343cde: (-s ours) Import translations. DO NOT MERGE
* commit '
0e343cde9c36a7f3d4cc192839d4938cc048159b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 18 Jun 2014 20:33:46 +0000 (13:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic51f4fc00312470d6a28b0a8347016eaf525c402
Auto-generated-cl: translation import
Baligh Uddin [Thu, 19 Jun 2014 19:13:48 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Sascha Haeberling [Wed, 18 Jun 2014 16:38:06 +0000 (09:38 -0700)]
Remote shutter should focus before taking a photo.
Bug:
13929364
Change-Id: Ib6fd83186100c67aef613f93bb8f9ea780da9ceb
Baligh Uddin [Wed, 18 Jun 2014 20:34:33 +0000 (13:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I03bddcd1e554a1b26e0c8f9e691e0ac4d83f6feb
Auto-generated-cl: translation import
Kevin Gabayan [Tue, 17 Jun 2014 18:17:05 +0000 (18:17 +0000)]
Merge "MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug:
14222601" into ub-camera-fishlake
Kevin Gabayan [Mon, 2 Jun 2014 21:48:20 +0000 (14:48 -0700)]
MotionManager for motion-aware focus unlock in Camera2. Second revision.
Bug:
14222601
Change-Id: I36637483b0d7efa2950cd93482de8f1e83bfa8aa
Baligh Uddin [Tue, 17 Jun 2014 14:29:20 +0000 (14:29 +0000)]
am
e2a0db87: (-s ours) Import translations. DO NOT MERGE
* commit '
e2a0db8780a0283fec98cf5ff5235eb4e956a0bc':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Jun 2014 20:14:06 +0000 (13:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f900c918cdcbca9f631ef6997b102cdae44f30b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 16 Jun 2014 20:13:21 +0000 (13:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I31efcdcda865c4cad85019eaba9e6c57a8a6e1bf
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Jun 2014 13:17:28 +0000 (13:17 +0000)]
am
65345934: (-s ours) Import translations. DO NOT MERGE
* commit '
653459343b06a87b6be5fe329365c37352fb182d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 13 Jun 2014 22:26:54 +0000 (15:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I65d653aa397dcf26ccb8451d087224a181c313d5
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Jun 2014 13:13:46 +0000 (13:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Fri, 13 Jun 2014 22:27:49 +0000 (15:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieb03ca010902aff60a08f74e382fa0e22bde4bd3
Auto-generated-cl: translation import
Doris Liu [Thu, 12 Jun 2014 23:14:38 +0000 (16:14 -0700)]
Remove workaround for K-MR1 that registers redundant preview callbacks
as MR2 has already started rollout, and is expected to finish before F release.
Change-Id: Ifa37a91f5270bb820d5bfb8db03bf21a71f225ff
Kevin Gabayan [Fri, 13 Jun 2014 20:50:13 +0000 (20:50 +0000)]
Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601"" into ub-camera-fishlake
Kevin Gabayan [Fri, 13 Jun 2014 20:49:48 +0000 (20:49 +0000)]
Revert "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601"
This reverts commit
ebba3288da5628c9ea7579b63139aa7b7312e137.
Change-Id: Ie82d81aa0440339aba1b762fa78caeb7f7d55312
Kevin Gabayan [Mon, 2 Jun 2014 21:48:20 +0000 (14:48 -0700)]
MotionManager for motion-aware focus unlock in Camera2
Bug:
14222601
Change-Id: Id118e12c8f789c74c8fc2e32ec208ff943b97e49
Spike Sprague [Wed, 11 Jun 2014 20:45:43 +0000 (20:45 +0000)]
Merge "intent captrue review gets its own ImageView! instead of relying on a stopped preview TextureView" into ub-camera-fishlake
Kevin Gabayan [Fri, 13 Jun 2014 19:44:53 +0000 (19:44 +0000)]
Merge "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601" into ub-camera-fishlake
Erin Dahlgren [Fri, 13 Jun 2014 18:26:09 +0000 (11:26 -0700)]
Adjust the GoogleHelp interface so Camera2 will build
Change-Id: I7aea16e8e967bd671cee2b07ee7cd93865df8cc5
Erin Dahlgren [Fri, 13 Jun 2014 17:42:26 +0000 (17:42 +0000)]
Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-camera-fishlake
Erin Dahlgren [Mon, 9 Jun 2014 21:37:34 +0000 (14:37 -0700)]
GoogleHelp affordance in CameraSettingsActivity
Uses the first Account available to launch a GoogleHelp
Activity from the CameraSettingsActivity. We remove the
affordance if the phone has no registered Accounts.
Bug:
8426295
Change-Id: I02f8f0accd76c19d42cbbd68c4043c174f13d424
Baligh Uddin [Tue, 10 Jun 2014 17:13:38 +0000 (17:13 +0000)]
am
a77630c8: (-s ours) Import translations. DO NOT MERGE
* commit '
a77630c81f874d93ab0563f722f20f62a5682fdb':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 10 Jun 2014 17:11:58 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Spike Sprague [Thu, 22 May 2014 21:40:53 +0000 (14:40 -0700)]
intent captrue review gets its own ImageView!
instead of relying on a stopped preview TextureView
bug:
13526027
Change-Id: I40d2a97d15ed5d27b0000fa0a6d96af03ad55cf9
Baligh Uddin [Mon, 9 Jun 2014 19:51:16 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68c296f9c040ad1a8e2badb6eacda78af7dffe7e
Auto-generated-cl: translation import
Baligh Uddin [Mon, 9 Jun 2014 19:50:26 +0000 (12:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifcad76652c0875b764733db288edea03f043c8b0
Auto-generated-cl: translation import
Spike Sprague [Mon, 9 Jun 2014 17:40:42 +0000 (17:40 +0000)]
Merge "CL in preparation of the s/Theme.Quantum/Theme.Material/ change" into ub-camera-fishlake
Spike Sprague [Fri, 6 Jun 2014 21:58:41 +0000 (14:58 -0700)]
CL in preparation of the s/Theme.Quantum/Theme.Material/ change
Change-Id: I416320dadc36cf0f0c76b2755ef9339838b39e13
Baligh Uddin [Sat, 7 Jun 2014 04:26:52 +0000 (04:26 +0000)]
am
8979bf79: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
8979bf79a7ea5ec0163ed50df7c9b0261c67ba26':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 7 Jun 2014 04:26:52 +0000 (04:26 +0000)]
am
6a710139: (-s ours) Import translations. DO NOT MERGE
* commit '
6a710139c464b50faad802150785f17775d06a48':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 7 Jun 2014 04:12:41 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Sat, 7 Jun 2014 04:12:40 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Sat, 7 Jun 2014 04:12:21 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Spike Sprague [Thu, 5 Jun 2014 17:49:30 +0000 (17:49 +0000)]
Merge "add Quantum theme to styles that were Holo (shows on android L, backwards compatible for K)" into ub-camera-fishlake
Spike Sprague [Wed, 4 Jun 2014 20:22:10 +0000 (13:22 -0700)]
add Quantum theme to styles that were Holo
(shows on android L, backwards compatible for K)
bug:
15345347
Change-Id: I1044e10e00ff136b0b5c095a7a9f4e56fd75c49a
Baligh Uddin [Wed, 4 Jun 2014 19:32:07 +0000 (12:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I102e1be18ad21865e4d292a87c8c5ebfe1e4cff0
Auto-generated-cl: translation import
Baligh Uddin [Wed, 4 Jun 2014 19:31:10 +0000 (12:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dc60f6fc74d80bbbca4ed390e2065e1e90166ea
Auto-generated-cl: translation import
Baligh Uddin [Wed, 4 Jun 2014 19:28:35 +0000 (12:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27f224443b51df2971493ffd12fedf83ce261c05
Auto-generated-cl: translation import
Baligh Uddin [Wed, 4 Jun 2014 19:27:44 +0000 (12:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic312c304754442fb29c4f3151f7a0ff5cb043ffd
Auto-generated-cl: translation import
Baligh Uddin [Wed, 4 Jun 2014 04:53:48 +0000 (04:53 +0000)]
am
97ab5266: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
97ab5266dbfe130944728fef86058ab6583595ef':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Jun 2014 04:53:47 +0000 (04:53 +0000)]
am
5adb7fc5: (-s ours) Import translations. DO NOT MERGE
* commit '
5adb7fc5407e23244ab6c9b53290a29d82da7776':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Jun 2014 04:50:23 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Wed, 4 Jun 2014 04:50:16 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Wed, 4 Jun 2014 04:50:08 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Mon, 2 Jun 2014 20:41:14 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I409bd9865c2823ca1e822eca638d4af579e3e7dd
Auto-generated-cl: translation import
Baligh Uddin [Mon, 2 Jun 2014 20:40:27 +0000 (13:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf334424ca5efd7ee7201b779c1eba028a39b269
Auto-generated-cl: translation import
Baligh Uddin [Mon, 2 Jun 2014 20:38:13 +0000 (13:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7447f4cc622840cb2ae4e13fd3d0fac1f93b40cb
Auto-generated-cl: translation import
Baligh Uddin [Mon, 2 Jun 2014 20:37:18 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9752938f549f6839fb071ef1da037bb9c4d76cc6
Auto-generated-cl: translation import
Erin Dahlgren [Mon, 2 Jun 2014 19:26:34 +0000 (19:26 +0000)]
Merge "Timeout on wait lock and throw exception to prevent ANR." into ub-camera-fishlake
Spike Sprague [Thu, 22 May 2014 00:20:24 +0000 (17:20 -0700)]
secure camera -> gallery launch hardcoded to
launch G+ photos
bug:
15141761
Change-Id: I5009d58917bbc1ea41b01d22b4c2e0f168f6b5cc
Geoff Mendal [Wed, 28 May 2014 20:12:56 +0000 (20:12 +0000)]
am
b758e1f7: (-s ours) Import translations. DO NOT MERGE
* commit '
b758e1f7c874d03b69f08987d9f104a38b1461bd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 May 2014 20:08:17 +0000 (13:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I77b01e3ceec1241e2bf623d19c027e0ae9d142fa
Auto-generated-cl: translation import
Geoff Mendal [Wed, 28 May 2014 20:07:30 +0000 (13:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76ec30918ff673b26642a565be3894db87602484
Auto-generated-cl: translation import
Baligh Uddin [Tue, 27 May 2014 18:04:22 +0000 (18:04 +0000)]
am
a27e4263: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
a27e42633b3ae306e97b830646a613f5ff91e704':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 May 2014 18:02:15 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Sascha Haeberling [Tue, 27 May 2014 17:59:14 +0000 (17:59 +0000)]
am
d58c9ccb: Fix build by removing references to removed strings.
* commit '
d58c9ccba64914e2c7c98927a9aca8c673ba9172':
Fix build by removing references to removed strings.
Baligh Uddin [Tue, 27 May 2014 17:54:08 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Sascha Haeberling [Tue, 27 May 2014 17:53:50 +0000 (10:53 -0700)]
Fix build by removing references to removed strings.
These got removed in 469821 but the build didn't fail beause
we still had translations.
Change-Id: Id74cbff53bc1859c3f35083b2f167374c87775b1
Baligh Uddin [Tue, 27 May 2014 17:52:52 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93478e89dc0ab82c5ba16525b74efeae88677dea
Auto-generated-cl: translation import
Seth Raphael [Tue, 27 May 2014 17:35:31 +0000 (17:35 +0000)]
am
cbf2efe0: Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-everglades
* commit '
cbf2efe047cc9db55076fca6e69116c32c72845a':
Fix NPE in CountdownSoundPlayer.
Baligh Uddin [Tue, 27 May 2014 17:35:31 +0000 (17:35 +0000)]
am
1b490ba4: (-s ours) Import translations. DO NOT MERGE
* commit '
1b490ba4f04c93cc58b5ffb3cb61eeef119cb762':
Import translations. DO NOT MERGE
Seth Raphael [Tue, 27 May 2014 17:33:59 +0000 (17:33 +0000)]
Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-everglades
Seth Raphael [Tue, 27 May 2014 16:45:26 +0000 (09:45 -0700)]
Fix NPE in CountdownSoundPlayer.
Bug:
15222673
Change-Id: I7068bbc8f4c063691647131160bf53fa4dd5f0f3
Baligh Uddin [Mon, 26 May 2014 22:03:07 +0000 (15:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I401fc80ba039b72713163157c447761666734bb8
Auto-generated-cl: translation import
Baligh Uddin [Mon, 26 May 2014 22:02:23 +0000 (15:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69865a9c8ae65cd6bdecea6b46de2f8518866e15
Auto-generated-cl: translation import
Erin Dahlgren [Fri, 23 May 2014 23:50:19 +0000 (16:50 -0700)]
Timeout on wait lock and throw exception to prevent ANR.
Change-Id: I5b0d2b8c0384d32ed0d870e5db6003991524fc38
Angus Kong [Fri, 23 May 2014 22:53:28 +0000 (22:53 +0000)]
am
7dc0fade: Merge "Restore the flash setting after HDR is off." into ub-camera-everglades
* commit '
7dc0fade17f0ee776997b7400870265a65d52dd4':
Restore the flash setting after HDR is off.
Angus Kong [Fri, 23 May 2014 22:50:22 +0000 (22:50 +0000)]
Merge "Restore the flash setting after HDR is off." into ub-camera-everglades
Angus Kong [Fri, 23 May 2014 22:31:09 +0000 (15:31 -0700)]
Restore the flash setting after HDR is off.
bug:
15162517
Change-Id: I4b159b6f9067ddde975d3b7692b781a9b18c8eed
Sam Judd [Fri, 23 May 2014 21:50:33 +0000 (21:50 +0000)]
am
8f93077d: Merge "Include signature in cache keys for Glide." into ub-camera-everglades
* commit '
8f93077d99183cb0f4d1af365e696a251d89ec4d':
Include signature in cache keys for Glide.
Sam Judd [Fri, 23 May 2014 21:47:23 +0000 (21:47 +0000)]
Merge "Include signature in cache keys for Glide." into ub-camera-everglades
Sam Judd [Fri, 23 May 2014 20:43:33 +0000 (13:43 -0700)]
Include signature in cache keys for Glide.
Bug:
14625920
Change-Id: Id010bae14ac163523215e3afad712a423aad5875
Sascha Haeberling [Fri, 23 May 2014 20:44:44 +0000 (20:44 +0000)]
am
c02d0773: Merge "Don\'t use translated strings for video sized until they\'re sane." into ub-camera-everglades
* commit '
c02d077353bcfe92f1fe4b8c642e50d4689b3528':
Don't use translated strings for video sized until they're sane.
Sascha Haeberling [Fri, 23 May 2014 20:42:56 +0000 (20:42 +0000)]
Merge "Don't use translated strings for video sized until they're sane." into ub-camera-everglades
Sascha Haeberling [Fri, 23 May 2014 19:25:51 +0000 (12:25 -0700)]
Don't use translated strings for video sized until they're sane.
Bug:
15131043
Change-Id: Ib134bee9094cb082a37133942f0606f5fb638f21
Doris Liu [Fri, 23 May 2014 19:05:27 +0000 (12:05 -0700)]
resolved conflicts for merge of
26aa92bf to ub-camera-fishlake
Change-Id: Ifa2422c520a78357b6e920b88ec5a744bb694a95
Doris Liu [Fri, 23 May 2014 01:39:46 +0000 (18:39 -0700)]
Add cling for settings button
Bug:
14683799
Change-Id: Id3785036f2b1642963dfa43f3272da314d952f2d
Angus Kong [Thu, 22 May 2014 22:57:15 +0000 (22:57 +0000)]
am
293b9628: Merge "Disable flash when HDR mode is on." into ub-camera-everglades
* commit '
293b9628a54ee3871f448e6f66fdc00d82d4adf2':
Disable flash when HDR mode is on.
Angus Kong [Thu, 22 May 2014 22:54:31 +0000 (22:54 +0000)]
Merge "Disable flash when HDR mode is on." into ub-camera-everglades
Seth Raphael [Thu, 22 May 2014 22:42:00 +0000 (22:42 +0000)]
am
b0800488: Merge "Address some code style nits." into ub-camera-everglades
* commit '
b0800488c841a3bd5238e5f9015c941c2c4f8f8c':
Address some code style nits.
Seth Raphael [Thu, 22 May 2014 22:41:59 +0000 (22:41 +0000)]
am
75b16d7d: Merge "Convert camera size settings on upgrade" into ub-camera-everglades
* commit '
75b16d7da5922cec46c1385bc3c175a09cbb1b08':
Convert camera size settings on upgrade
Seth Raphael [Thu, 22 May 2014 21:54:03 +0000 (21:54 +0000)]
Merge "Address some code style nits." into ub-camera-everglades
Seth Raphael [Thu, 22 May 2014 21:53:56 +0000 (21:53 +0000)]
Merge "Convert camera size settings on upgrade" into ub-camera-everglades
Seth Raphael [Thu, 22 May 2014 17:37:22 +0000 (10:37 -0700)]
Address some code style nits.
Change-Id: I0672216f0d2ccbd7f708a974a573a46e732d4580
OSDN Git Service
