OSDN Git Service
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
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
Baligh Uddin [Mon, 2 Jun 2014 20:42:00 +0000 (13:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50368d2ef080ee0bfbcfeccbaf54542c60d0d780
Auto-generated-cl: translation import
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:39:01 +0000 (13:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ee97c52c3b811326344cec02cb845b32ee88171
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
OSDN Git Service
