OSDN Git Service
Kevin Gabayan [Fri, 20 Jun 2014 03:37:47 +0000 (03:37 +0000)]
am
2b04dc42: Merge "Memory window analysis in Camera2. Bug:
13280671" into ub-camera-fishlake
* commit '
2b04dc42f691257742a7f73f4d9e803ea4a0d7ed':
Memory window analysis in Camera2. Bug:
13280671
Baligh Uddin [Thu, 19 Jun 2014 19:19:09 +0000 (19:19 +0000)]
am
7d0c9f68: (-s ours) am
0e343cde: (-s ours) Import translations. DO NOT MERGE
* commit '
7d0c9f68718f4d631b24d105144f252c928c7e71':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Jun 2014 19:16:01 +0000 (19:16 +0000)]
am
c9feac67: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
c9feac671fb51fa343138b1e93906e57b1ba0e64':
Import translations. DO NOT MERGE
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
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
Kevin Gabayan [Thu, 17 Apr 2014 20:56:10 +0000 (13:56 -0700)]
Memory window analysis in Camera2.
Bug:
13280671
Change-Id: I22249e6aeb76dca2fe79e49d3bd75c089fa7936f
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:43 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Sascha Haeberling [Thu, 19 Jun 2014 17:19:30 +0000 (10:19 -0700)]
Fixing bad manual merge to fix build.
Change-Id: I0a96593e72240de5e1ffa562704b30932fddb4f3
Sascha Haeberling [Thu, 19 Jun 2014 07:38:52 +0000 (00:38 -0700)]
resolved conflicts for merge of
1bf0889d to ub-camera-glacier
Change-Id: I5281f7c362165bc5a9d0790601fd8d1b29a71d4e
Angus Kong [Thu, 19 Jun 2014 00:20:34 +0000 (17:20 -0700)]
Fix the build.
Change-Id: Id8acdcfa54721042e61e16a9c50381e61414f778
Erin Dahlgren [Fri, 13 Jun 2014 21:12:08 +0000 (14:12 -0700)]
New Settings API
Based on discussions from last week and comments on the design doc,
this api begins to implement the following:
1. Adds a "Scope" variable to api, which tells the SettingsManager
whether the setting can be stored globally (so that it is visible
to all parts of the app), or per-camera, or per-module, or per-
custom scope that the api user provides.
2. Separates keys and default values from SettingsManager,
to make it easy to add new settings/defaults from third party
modules.
3. Stores all settings as strings, to avoid upgrade errors, and
handles casting to type requested. Only String, Integer, and
boolean are supported.
4. Opens SharedPreferences files on demand, depending on scope
argument.
5. Creates a "DefaultsStore" to hold the defaults and possible
values of a setting. Then a user can request the default or
possible values of a setting at any time.
Change-Id: I03e0e1dd0955c519f54112e89716014aa963a425
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:36:04 +0000 (13:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibbb0fdf0ac471f6a59db931f5b818540bb932556
Auto-generated-cl: translation import
Sol Boucher [Tue, 17 Jun 2014 21:05:08 +0000 (14:05 -0700)]
Remove cameradevice subpackage and point references at ex library
This code is being relocated into frameworks/ex for availability to other apps.
Change-Id: Icada261ac7a795b08dd8b187dfd17077077b37c3
Baligh Uddin [Thu, 19 Jun 2014 19:13:48 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
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:19:59 +0000 (18:19 +0000)]
am
09a46ccb: Merge "MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug:
14222601" into ub-camera-fishlake
* commit '
09a46ccb10504579417609d2486dc28e92458bf7':
MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug:
14222601
Spike Sprague [Tue, 17 Jun 2014 18:01:05 +0000 (11:01 -0700)]
Clarify filmstrip accessibility strings and comments
bug:
15600867
bug:
15595791
bug:
15586834
Change-Id: Ic20b693a85df0c76cea7b175f561a60d82b8d446
Baligh Uddin [Tue, 17 Jun 2014 14:32:01 +0000 (14:32 +0000)]
am
18179f40: (-s ours) am
e2a0db87: (-s ours) Import translations. DO NOT MERGE
* commit '
18179f40c7c4e8b893354b9b17ae6b6b1b412b8a':
Import translations. DO NOT MERGE
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 [Tue, 17 Jun 2014 14:28:44 +0000 (14:28 +0000)]
am
cae93db7: (-s ours) Import translations. DO NOT MERGE
* commit '
cae93db7c84d83946a13c792ca46b32e396bf6c6':
Import translations. DO NOT MERGE
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 [Mon, 16 Jun 2014 20:15:31 +0000 (13:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ef9c0d484fbad4b924941b6e1aeb213d47f909c
Auto-generated-cl: translation import
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:20:13 +0000 (13:20 +0000)]
am
daebadaa: (-s ours) am
65345934: (-s ours) Import translations. DO NOT MERGE
* commit '
daebadaabddabc7ee246251b711a7a137ca6042b':
Import translations. DO NOT MERGE
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 [Sun, 15 Jun 2014 13:17:06 +0000 (13:17 +0000)]
am
63949bb0: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
63949bb0372b08ab12c78d2fac6f0bf224df8db6':
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:40 +0000 (13:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Fri, 13 Jun 2014 22:29:29 +0000 (15:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibdbe21956c33c6ed635e5472d2a6fed4360c6ef6
Auto-generated-cl: translation import
Angus Kong [Fri, 13 Jun 2014 20:55:54 +0000 (13:55 -0700)]
Don't pass empty list of areas.
Some devices won't work well if we pass in an empty list of focusing or metering
areas.
Change-Id: Iff6bfd37a7d551b12c43e88cf8d4934472837257
Kevin Gabayan [Fri, 13 Jun 2014 20:52:00 +0000 (20:52 +0000)]
am
811a814d: Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601"" into ub-camera-fishlake
* commit '
811a814dc3a2221048c1b23206a9d0a4bf9b6901':
Revert "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601"
Kevin Gabayan [Fri, 13 Jun 2014 19:47:58 +0000 (19:47 +0000)]
am
bacc2584: Merge "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601" into ub-camera-fishlake
* commit '
bacc2584a7c03931643dd4c2d95d6c3f302e4a00':
MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601
Erin Dahlgren [Fri, 13 Jun 2014 18:28:35 +0000 (18:28 +0000)]
am
40d67958: Adjust the GoogleHelp interface so Camera2 will build
* commit '
40d67958ecc152879a9aca554245d7e1341bb908':
Adjust the GoogleHelp interface so Camera2 will build
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:45:13 +0000 (17:45 +0000)]
am
51c55dac: Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-camera-fishlake
* commit '
51c55dac6950dca94a40b3fb685fb075ca47120e':
GoogleHelp affordance in CameraSettingsActivity
Doris Liu [Fri, 13 Jun 2014 01:12:31 +0000 (18:12 -0700)]
resolved conflicts for merge of
2c8ac0ad to ub-camera-glacier
Change-Id: If25e388378acefe505c6bd8fed530eacb0bef6eb
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
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 [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
Angus Kong [Thu, 12 Jun 2014 21:31:13 +0000 (21:31 +0000)]
Merge "Refactor out Camera.Parameters." into ub-camera-glacier
Angus Kong [Tue, 10 Jun 2014 23:07:45 +0000 (16:07 -0700)]
Refactor out Camera.Parameters.
Change-Id: Ibc1ddac509381530e887b7491069e6367e9a6088
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
Spike Sprague [Wed, 11 Jun 2014 21:07:55 +0000 (21:07 +0000)]
Merge "disambiguate media types in capture/filmstrip a11y descriptions" into ub-camera-glacier
Spike Sprague [Wed, 11 Jun 2014 20:48:38 +0000 (20:48 +0000)]
am
40468e76: Merge "intent captrue review gets its own ImageView! instead of relying on a stopped preview TextureView" into ub-camera-fishlake
* commit '
40468e76810596e1dd9ec6bfeb05d0ab7bf38b4e':
intent captrue review gets its own ImageView! instead of relying on a stopped preview TextureView
Spike Sprague [Wed, 28 May 2014 01:26:30 +0000 (18:26 -0700)]
disambiguate media types in capture/filmstrip a11y descriptions
capture uses current mode for better description string.
filmstrip uses metadata util functions for better description.
bug:
14473074
Change-Id: Id7c87a2cbd3ce5f072f433e74ca6139bf47f2fc7
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
Sol Boucher [Tue, 10 Jun 2014 18:16:33 +0000 (18:16 +0000)]
Merge "Refactor CameraManager hierarchy to support new implementations" into ub-camera-glacier
Baligh Uddin [Tue, 10 Jun 2014 17:17:32 +0000 (17:17 +0000)]
am
a389de32: (-s ours) am
a77630c8: (-s ours) Import translations. DO NOT MERGE
* commit '
a389de32f22c94cc443641477a738cca1ebd5927':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 10 Jun 2014 17:14:21 +0000 (17:14 +0000)]
am
dcb8cb1f: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
dcb8cb1fbb5ca544b81a8ebcbb7539362ffb0f54':
Import translations. DO NOT MERGE
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:12:01 +0000 (17:12 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Tue, 10 Jun 2014 17:11:58 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Sol Boucher [Mon, 9 Jun 2014 21:37:08 +0000 (14:37 -0700)]
Refactor CameraManager hierarchy to support new implementations
This relocates several components of the implementation class
AndroidCameraManagerImpl to higher levels in the inheritence hierarchy, where
they can be reused by other implementations of the CameraManager interface:
- AndroidCameraManager.DispatchThread is moved into its own file
- The core (history-tracking) pieces of CameraManager.CameraHandler are moved
into their own HistoryHandler class, which the former is made to inherit
- The constants defined in AndroidCameraManagerImpl for use in its nested
CameraHandler class are moved into a separate class called CameraActions
- AndroidCameraManagerImpl.CameraStateHolder is moved into its own file
- Those CallbackForward classes that aren't tied to Android's Camera1 API are
moved directly into the CameraManager interface
Change-Id: I5f3e1eb72039a0018ce2277e3ec6289bfa4ccec3
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:52:41 +0000 (12:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: If468268b7ede5727c56030acad04cefc7c3ec0c8
Auto-generated-cl: translation import
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:41:52 +0000 (17:41 +0000)]
am
6ed97734: Merge "CL in preparation of the s/Theme.Quantum/Theme.Material/ change" into ub-camera-fishlake
* commit '
6ed977348c44c262b2d0e2c96bfdd13698ca8f77':
CL in preparation of the s/Theme.Quantum/Theme.Material/ change
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:30:07 +0000 (04:30 +0000)]
am
f5e1977e: (-s ours) am
8979bf79: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
f5e1977e04c7367cdfb675635ab1b5f67eefc81d':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 7 Jun 2014 04:30:06 +0000 (04:30 +0000)]
am
d4050ce8: (-s ours) am
6a710139: (-s ours) Import translations. DO NOT MERGE
* commit '
d4050ce8589c5c337d57bd9a66e482709a20bf60':
Import translations. DO NOT MERGE
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:26:50 +0000 (04:26 +0000)]
am
9829d385: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
9829d38573469056c9104e489284f371f8ffa358':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 7 Jun 2014 04:26:46 +0000 (04:26 +0000)]
am
a374f387: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
a374f3878beb190930bb600baed4903d49fd14d2':
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:38 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Sat, 7 Jun 2014 04:12:21 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Sat, 7 Jun 2014 04:12:19 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Spike Sprague [Thu, 5 Jun 2014 17:52:57 +0000 (17:52 +0000)]
am
ec8c2697: Merge "add Quantum theme to styles that were Holo (shows on android L, backwards compatible for K)" into ub-camera-fishlake
* commit '
ec8c26973947fe7a1a6ca43dcaa3b0bcde30a74c':
add Quantum theme to styles that were Holo (shows on android L, backwards compatible for K)
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:59 +0000 (12:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4bca0e17fdbfe9dc4922ae3d9cb8074f023f1621
Auto-generated-cl: translation import
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:29:29 +0000 (12:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea72efcd91cf5cc1c0b9a3b52c11fa73853cab56
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:57:00 +0000 (04:57 +0000)]
am
2e6f38f0: (-s ours) am
97ab5266: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
2e6f38f07917adb06cc41da8d14b0b197909aa0d':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Jun 2014 04:56:59 +0000 (04:56 +0000)]
am
6e83e00d: (-s ours) am
5adb7fc5: (-s ours) Import translations. DO NOT MERGE
* commit '
6e83e00da8766429240c2e33e4650f6466f66b1c':
Import translations. DO NOT MERGE
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:53:23 +0000 (04:53 +0000)]
am
cd32e4b9: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
cd32e4b9c0e37be25f9d49f94b9cfc32dcf80e89':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Jun 2014 04:53:23 +0000 (04:53 +0000)]
am
993b9075: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
993b9075c383194ccd06d4ef3be781a09ab3ebfd':
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:14 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
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 [Wed, 4 Jun 2014 04:50:05 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier