OSDN Git Service

android-x86/packages-apps-Camera2.git
8 years agoam 45e0aa09: (-s ours) am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translati...
Geoff Mendal [Wed, 15 Jul 2015 14:24:59 +0000 (14:24 +0000)]
am 45e0aa09: (-s ours) am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE

* commit '45e0aa097a92d5019e69002871ccb337a9b3d7b1':
  Import translations. DO NOT MERGE

8 years agoam 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:24:58 +0000 (14:24 +0000)]
am 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translations. DO NOT MERGE

* commit '9ef51ffc17e2cdfe21311a89558c31633e3c1d6d':
  Import translations. DO NOT MERGE

8 years agoam 13688c8b: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:09:40 +0000 (14:09 +0000)]
am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE

* commit '13688c8b7e84a2ff8017c33db35559b5d0fb878a':
  Import translations. DO NOT MERGE

8 years agoam d8296c0e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:09:39 +0000 (14:09 +0000)]
am d8296c0e: (-s ours) Import translations. DO NOT MERGE

* commit 'd8296c0e192b71603b3a473cfc696ccfffb04162':
  Import translations. DO NOT MERGE

8 years agoam a95faf78: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:02:38 +0000 (14:02 +0000)]
am a95faf78: (-s ours) Import translations. DO NOT MERGE

* commit 'a95faf780471afea65bb4e5f2b2570e4d9a4e7b9':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 13:51:19 +0000 (06:51 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icc30bb057630e9fde4214259ba5407d99475c3b8
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 13:50:15 +0000 (06:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: I11944ad0054d472734152d0021b52eec67e3821a
Auto-generated-cl: translation import

8 years agoam 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9...
Geoff Mendal [Tue, 14 Jul 2015 22:04:15 +0000 (22:04 +0000)]
am 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE

* commit '6bee46a1b4cbfc420d9c020bbab3d7821de7acbe':
  Import translations. DO NOT MERGE

8 years agoam ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213...
Geoff Mendal [Tue, 14 Jul 2015 21:49:18 +0000 (21:49 +0000)]
am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE

* commit 'ec28103983e6b51d582eeff8df8f3a4e3aeab2a2':
  Import translations. DO NOT MERGE

8 years agoam 04312d09: (-s ours) am 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7...
Geoff Mendal [Tue, 14 Jul 2015 21:48:51 +0000 (21:48 +0000)]
am 04312d09: (-s ours) am 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE

* commit '04312d09bcc42332cd582c659ee483f52e1eae12':
  Import translations. DO NOT MERGE

8 years agoam 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translati...
Geoff Mendal [Tue, 14 Jul 2015 21:37:52 +0000 (21:37 +0000)]
am 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE

* commit '15579b8d972cc0b986d8fd39debaede674ae0bce':
  Import translations. DO NOT MERGE

8 years agoam 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translati...
Geoff Mendal [Tue, 14 Jul 2015 21:34:12 +0000 (21:34 +0000)]
am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE

* commit '498af6a5693cde49419f3a9abcfeb572d3a461e2':
  Import translations. DO NOT MERGE

8 years agoam ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 21:19:22 +0000 (21:19 +0000)]
am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE

* commit 'ca7f4ce983d0bf25433226eb35f052741339ef12':
  Import translations. DO NOT MERGE

8 years agoam 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 21:18:38 +0000 (21:18 +0000)]
am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE

* commit '4e3575eb98e1b60600a9146862ab190491eec035':
  Import translations. DO NOT MERGE

8 years agoam ec5a5213: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 21:06:00 +0000 (21:06 +0000)]
am ec5a5213: (-s ours) Import translations. DO NOT MERGE

* commit 'ec5a52136e344305fac60f6053fe4c36aa24ceb8':
  Import translations. DO NOT MERGE

8 years agoam 4c77d6a7: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 20:53:48 +0000 (20:53 +0000)]
am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE

* commit '4c77d6a70be80db4aac675d6a795708e7f0c57b4':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 20:46:35 +0000 (13:46 -0700)]
Import translations. DO NOT MERGE

Change-Id: I98a926452e577686aa0fa16232c7e25a6a8ba234
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 20:40:25 +0000 (13:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic68870870e0b7c0b89c4dad2cecf0981ae6086fc
Auto-generated-cl: translation import

8 years agoam 33fc1716: am 801d5289: am cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListV...
Alan Newberger [Tue, 14 Jul 2015 00:42:26 +0000 (00:42 +0000)]
am 33fc1716: am 801d5289: am cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala

* commit '33fc1716c60a411f6b3c12c57cc29fc56f610732':
  Set ModeListView to LTR layout

8 years agoam f962ec00: (-s ours) am c3b7039c: (-s ours) am f3eb023d: (-s ours) am 50f8944c...
Geoff Mendal [Tue, 14 Jul 2015 00:42:24 +0000 (00:42 +0000)]
am f962ec00: (-s ours) am c3b7039c: (-s ours) am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE

* commit 'f962ec00095ce774a5db134df1c19aa116d2e9ad':
  Import translations. DO NOT MERGE

8 years agoam 521c3909: (-s ours) am 4732765a: (-s ours) am eb29ae19: (-s ours) am 45289c3d...
Geoff Mendal [Tue, 14 Jul 2015 00:42:23 +0000 (00:42 +0000)]
am 521c3909: (-s ours) am 4732765a: (-s ours) am eb29ae19: (-s ours) am 45289c3d: (-s ours) Import translations. DO NOT MERGE

* commit '521c390994117d6d2b819bf9f69c4e31fc305e22':
  Import translations. DO NOT MERGE

8 years agoam 3cabdc8d: (-s ours) am 05bbbfc5: (-s ours) am 0e58fb83: (-s ours) Import translati...
Geoff Mendal [Tue, 14 Jul 2015 00:42:22 +0000 (00:42 +0000)]
am 3cabdc8d: (-s ours) am 05bbbfc5: (-s ours) am 0e58fb83: (-s ours) Import translations. DO NOT MERGE

* commit '3cabdc8dffb75ceaf6d4a524ef15e7b273cc6d83':
  Import translations. DO NOT MERGE

8 years agoam 35a0e880: (-s ours) am e552d003: (-s ours) am 57b4d24e: (-s ours) am 09364eeb...
Geoff Mendal [Tue, 14 Jul 2015 00:42:21 +0000 (00:42 +0000)]
am 35a0e880: (-s ours) am e552d003: (-s ours) am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE

* commit '35a0e8808a3800bb4bcc1fc70c103cf15f3524e1':
  Import translations. DO NOT MERGE

8 years agoam 3fa50c35: (-s ours) am a06a903f: (-s ours) am 5d806912: (-s ours) am e27c079d...
Geoff Mendal [Tue, 14 Jul 2015 00:42:20 +0000 (00:42 +0000)]
am 3fa50c35: (-s ours) am a06a903f: (-s ours) am 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE

* commit '3fa50c35c2d4f6cdcaaaa09e135a0f77be676c9b':
  Import translations. DO NOT MERGE

8 years agoam ea4dc6fc: (-s ours) am 718859d8: (-s ours) am 0462d5b1: (-s ours) Import translati...
Geoff Mendal [Tue, 14 Jul 2015 00:42:19 +0000 (00:42 +0000)]
am ea4dc6fc: (-s ours) am 718859d8: (-s ours) am 0462d5b1: (-s ours) Import translations. DO NOT MERGE

* commit 'ea4dc6fcafb1528553422b26b5816040b6c31511':
  Import translations. DO NOT MERGE

8 years agoam 4bbdfc81: am ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location...
Alan Newberger [Tue, 14 Jul 2015 00:42:18 +0000 (00:42 +0000)]
am 4bbdfc81: am ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit '4bbdfc81dd9302f9ad2359e50e8fa73a42bcee14':
  Shorten location startup dialog string

8 years agoam 801d5289: am cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR...
Alan Newberger [Mon, 13 Jul 2015 23:37:35 +0000 (23:37 +0000)]
am 801d5289: am cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala

* commit '801d5289e434f2d8c1ce85f9bda3d9cd41117d0a':
  Set ModeListView to LTR layout

8 years agoam c3b7039c: (-s ours) am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74...
Geoff Mendal [Mon, 13 Jul 2015 23:37:34 +0000 (23:37 +0000)]
am c3b7039c: (-s ours) am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE

* commit 'c3b7039c31eea15b1e45471ce1fac1f336a47ad5':
  Import translations. DO NOT MERGE

8 years agoam 4732765a: (-s ours) am eb29ae19: (-s ours) am 45289c3d: (-s ours) Import translati...
Geoff Mendal [Mon, 13 Jul 2015 23:37:33 +0000 (23:37 +0000)]
am 4732765a: (-s ours) am eb29ae19: (-s ours) am 45289c3d: (-s ours) Import translations. DO NOT MERGE

* commit '4732765ae07ff7b74f3ba3e546c54e37b0ac01e6':
  Import translations. DO NOT MERGE

8 years agoam 05bbbfc5: (-s ours) am 0e58fb83: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 23:37:32 +0000 (23:37 +0000)]
am 05bbbfc5: (-s ours) am 0e58fb83: (-s ours) Import translations. DO NOT MERGE

* commit '05bbbfc5cb24d06e5ad56b70b8b1551d8cafac03':
  Import translations. DO NOT MERGE

8 years agoam e552d003: (-s ours) am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be...
Geoff Mendal [Mon, 13 Jul 2015 23:37:31 +0000 (23:37 +0000)]
am e552d003: (-s ours) am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE

* commit 'e552d003412958f09168f239ab802b9af29fcfe8':
  Import translations. DO NOT MERGE

8 years agoam a06a903f: (-s ours) am 5d806912: (-s ours) am e27c079d: (-s ours) Import translati...
Geoff Mendal [Mon, 13 Jul 2015 23:37:30 +0000 (23:37 +0000)]
am a06a903f: (-s ours) am 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE

* commit 'a06a903fa4f414bd5a1aa0c6061a5b46b7739013':
  Import translations. DO NOT MERGE

8 years agoam 718859d8: (-s ours) am 0462d5b1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 23:37:29 +0000 (23:37 +0000)]
am 718859d8: (-s ours) am 0462d5b1: (-s ours) Import translations. DO NOT MERGE

* commit '718859d892a1b0fae7cfe470e42a028f46da9000':
  Import translations. DO NOT MERGE

8 years agoam ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog...
Alan Newberger [Mon, 13 Jul 2015 23:34:32 +0000 (23:34 +0000)]
am ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit 'ca758103543d7f5145ee93e876b7cf5b17b0fb37':
  Shorten location startup dialog string

8 years agoam cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into...
Alan Newberger [Mon, 13 Jul 2015 23:01:40 +0000 (23:01 +0000)]
am cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala

* commit 'cc4f1804cdd1bd41b1531883db25c28a55326f4c':
  Set ModeListView to LTR layout

8 years agoam f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translati...
Geoff Mendal [Mon, 13 Jul 2015 23:01:10 +0000 (23:01 +0000)]
am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE

* commit 'f3eb023d60d359d19169be04d417c88c130636f2':
  Import translations. DO NOT MERGE

8 years agoam eb29ae19: (-s ours) am 45289c3d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 23:01:09 +0000 (23:01 +0000)]
am eb29ae19: (-s ours) am 45289c3d: (-s ours) Import translations. DO NOT MERGE

* commit 'eb29ae196e61227396ebb13ca3b6f14d4f00802a':
  Import translations. DO NOT MERGE

8 years agoam 0e58fb83: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 23:01:07 +0000 (23:01 +0000)]
am 0e58fb83: (-s ours) Import translations. DO NOT MERGE

* commit '0e58fb83b7dc93ac4f55d21900a4244b3a89cdf0':
  Import translations. DO NOT MERGE

8 years agoam 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translati...
Geoff Mendal [Mon, 13 Jul 2015 23:00:25 +0000 (23:00 +0000)]
am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE

* commit '57b4d24e779a10a6dccf4c5c841d1f43c2bc77fd':
  Import translations. DO NOT MERGE

8 years agoam 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 23:00:23 +0000 (23:00 +0000)]
am 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE

* commit '5d806912451dd81453aac72c9b7b2fa53e4f6096':
  Import translations. DO NOT MERGE

8 years agoam 0462d5b1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 23:00:22 +0000 (23:00 +0000)]
am 0462d5b1: (-s ours) Import translations. DO NOT MERGE

* commit '0462d5b16c7e6c00ecc6bf74df57fca7ba5a3c19':
  Import translations. DO NOT MERGE

8 years agoam c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string
Alan Newberger [Mon, 13 Jul 2015 22:30:17 +0000 (22:30 +0000)]
am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit 'c9b45d41b93f0e31ed88cf22db387006b8219333':
  Shorten location startup dialog string

8 years agoam 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala
Alan Newberger [Mon, 13 Jul 2015 16:31:48 +0000 (16:31 +0000)]
am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala

* commit '6bb610be1aa27864d4049732f330e277623a9381':
  Set ModeListView to LTR layout

8 years agoam ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala
Alan Newberger [Mon, 13 Jul 2015 16:25:21 +0000 (16:25 +0000)]
am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala

* commit 'ad510fddb124d1e02fd1e135d672ab1f14923e56':
  Set ModeListView to LTR layout

8 years agoMerge "Set ModeListView to LTR layout" into ub-camera-haleakala
Alan Newberger [Mon, 13 Jul 2015 16:17:35 +0000 (16:17 +0000)]
Merge "Set ModeListView to LTR layout" into ub-camera-haleakala

8 years agoam aecc99f4: (-s ours) am 1fee657d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:31:37 +0000 (15:31 +0000)]
am aecc99f4: (-s ours) am 1fee657d: (-s ours) Import translations. DO NOT MERGE

* commit 'aecc99f49add5b4ca918f72f90e061f9116247ea':
  Import translations. DO NOT MERGE

8 years agoam 1fee657d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:09:29 +0000 (15:09 +0000)]
am 1fee657d: (-s ours) Import translations. DO NOT MERGE

* commit '1fee657d480865262f8e4659624b1ae40f2963a6':
  Import translations. DO NOT MERGE

8 years agoam 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 12:54:37 +0000 (12:54 +0000)]
am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE

* commit '50f8944c200e20e6a387e2cade03865ae95368ec':
  Import translations. DO NOT MERGE

8 years agoam 45289c3d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 12:48:26 +0000 (12:48 +0000)]
am 45289c3d: (-s ours) Import translations. DO NOT MERGE

* commit '45289c3d39d24b7530e4478af0120da4a21e2744':
  Import translations. DO NOT MERGE

8 years agoam 1ac1ac74: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 12:47:42 +0000 (12:47 +0000)]
am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE

* commit '1ac1ac74af7007eb7351eb60c832e1f405252f34':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 12:20:38 +0000 (05:20 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idd4712a71746b45c1512f75c8d1062513acb3a6a
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 12:19:38 +0000 (05:19 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3b7e6493447bb1c23aa65ab3dd326d51210b2256
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 12:17:44 +0000 (05:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id2b5c6b23f376ad17dd40559e4da37ddee650443
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 16:51:55 +0000 (09:51 -0700)]
Import translations. DO NOT MERGE

Change-Id: I77039d1b70cd2caa6f758fd1773e40289198b552
Auto-generated-cl: translation import

8 years agoam 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 12:41:38 +0000 (12:41 +0000)]
am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE

* commit '09364eebaa1c07801e5849b73c5163646b4ceb4d':
  Import translations. DO NOT MERGE

8 years agoam e27c079d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 12:35:25 +0000 (12:35 +0000)]
am e27c079d: (-s ours) Import translations. DO NOT MERGE

* commit 'e27c079d3634309d3d709a6bd8b1a2e5b032ec65':
  Import translations. DO NOT MERGE

8 years agoam b980a5be: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 12:34:51 +0000 (12:34 +0000)]
am b980a5be: (-s ours) Import translations. DO NOT MERGE

* commit 'b980a5be2ea0d39d99e4946885278efbfaf1bf37':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 12:26:23 +0000 (05:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: I29df25340044638daaed9d2fd7828b85af0eef86
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 12:25:19 +0000 (05:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: If81760a295e909e517fe103cdd0fbe014d647dc5
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 12:24:20 +0000 (05:24 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4b769451a358ff48a35ec059b2574462fd2ddd65
Auto-generated-cl: translation import

8 years agoSet ModeListView to LTR layout
Alan Newberger [Sat, 11 Jul 2015 01:22:20 +0000 (18:22 -0700)]
Set ModeListView to LTR layout

Mode list is LTR layout at all times. But without being marked as
such, subitems like SettingsCling had their getLeft View property
adjusted for RTL layout. SettingsCling had a ~800 pixel left
property under RTL vs 0 in LTR, causing it to set itself off
screen.

BUG=22206761

Change-Id: I356e464a1121069def71c350902c032833542c29

8 years agoam 01c3f7ad: am e25f675a: Shorten location startup dialog string
Alan Newberger [Sat, 11 Jul 2015 00:34:29 +0000 (00:34 +0000)]
am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit '01c3f7adc5ee35ecd6ad226ad91a03017c0ad4a0':
  Shorten location startup dialog string

8 years agoam e25f675a: Shorten location startup dialog string
Alan Newberger [Sat, 11 Jul 2015 00:28:45 +0000 (00:28 +0000)]
am e25f675a: Shorten location startup dialog string

* commit 'e25f675a189f56df57d08b62fa3604843dfee4a8':
  Shorten location startup dialog string

8 years agoShorten location startup dialog string
Alan Newberger [Fri, 10 Jul 2015 23:46:40 +0000 (16:46 -0700)]
Shorten location startup dialog string

BUG=21706101

Change-Id: I66164d43830cb71bb3a24f0f996a533358cb7d7e

8 years agoam b92d395a: am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when...
Alan Newberger [Fri, 10 Jul 2015 17:30:02 +0000 (17:30 +0000)]
am b92d395a: am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

* commit 'b92d395a9a3ac5a9b88b872f0f9621ba8e83cf40':
  Null check when evaluating valid resolution size

8 years agoam 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid...
Alan Newberger [Fri, 10 Jul 2015 17:15:34 +0000 (17:15 +0000)]
am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

* commit '981eb996de64e9e798fa76c59e50d52e6dc1aa8f':
  Null check when evaluating valid resolution size

8 years agoam ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution...
Alan Newberger [Fri, 10 Jul 2015 17:06:43 +0000 (17:06 +0000)]
am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

* commit 'ade8896d12cb0c250c24e38e81848f5fb9032310':
  Null check when evaluating valid resolution size

8 years agoam 2fc4970c: am 00720781: Null check when evaluating valid resolution size
Alan Newberger [Fri, 10 Jul 2015 16:55:18 +0000 (16:55 +0000)]
am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

* commit '2fc4970c2631ec5593c4566a72d4524014b49a29':
  Null check when evaluating valid resolution size

8 years agoam 00720781: Null check when evaluating valid resolution size
Alan Newberger [Fri, 10 Jul 2015 16:48:42 +0000 (16:48 +0000)]
am 00720781: Null check when evaluating valid resolution size

* commit '00720781f6703de532ddbc05238db5bf5fd7cd2d':
  Null check when evaluating valid resolution size

8 years agoNull check when evaluating valid resolution size
Alan Newberger [Fri, 10 Jul 2015 16:39:13 +0000 (09:39 -0700)]
Null check when evaluating valid resolution size

Guard against nonexistent size so that logic to reset size
preference can proceed

BUG=22396405

Change-Id: Id508713ef91f632867366934e72fe939a839e228

8 years agoam b7142d73: am c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if...
zafir [Thu, 9 Jul 2015 01:48:58 +0000 (01:48 +0000)]
am b7142d73: am c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

* commit 'b7142d73e83a27aba7f874c2f79c2b66d221c8a0':
  Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

8 years agoam c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity...
zafir [Thu, 9 Jul 2015 01:35:27 +0000 (01:35 +0000)]
am c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

* commit 'c28abdb81256db38f8a6ee4780d7e3d091d65991':
  Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

8 years agoam dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is...
zafir [Thu, 9 Jul 2015 01:21:54 +0000 (01:21 +0000)]
am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

* commit 'dfd3ecb1b6bbec03d419b3a65a10dd344ae5dbc3':
  Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

8 years agoam 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without...
zafir [Thu, 9 Jul 2015 01:12:05 +0000 (01:12 +0000)]
am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

* commit '148d0b8e3fd412fa6a666e75484fe6b7e0465f5a':
  Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

8 years agoLaunch PermissionsActivity if CameraActivity resume is called without critical permis...
zafir [Wed, 8 Jul 2015 23:12:02 +0000 (16:12 -0700)]
Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

Bug: 22358833
Change-Id: I5c189d4976b9355d531e028ecc163bb67bae6987

8 years agoam c5a1f6cf: am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after...
Alan Newberger [Wed, 8 Jul 2015 20:30:41 +0000 (20:30 +0000)]
am c5a1f6cf: am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity

* commit 'c5a1f6cf4e13bcad4fd7b29631cd20d67d70c75e':
  Clear permissions check after successful PermissionsActivity

8 years agoam b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful Permi...
Alan Newberger [Wed, 8 Jul 2015 20:16:53 +0000 (20:16 +0000)]
am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity

* commit 'b01de9c315cd69ee995d034475e5470c677b3105':
  Clear permissions check after successful PermissionsActivity

8 years agoam 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity
Alan Newberger [Wed, 8 Jul 2015 20:07:55 +0000 (20:07 +0000)]
am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity

* commit '6e0e81f33fb78722474ee139c99c8f2e94af5592':
  Clear permissions check after successful PermissionsActivity

8 years agoam 5c8c7d3c: Clear permissions check after successful PermissionsActivity
Alan Newberger [Wed, 8 Jul 2015 19:59:53 +0000 (19:59 +0000)]
am 5c8c7d3c: Clear permissions check after successful PermissionsActivity

* commit '5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233':
  Clear permissions check after successful PermissionsActivity

8 years agoClear permissions check after successful PermissionsActivity
Alan Newberger [Wed, 8 Jul 2015 19:42:04 +0000 (12:42 -0700)]
Clear permissions check after successful PermissionsActivity

If the permissions activity indicates the user was successful,
mark mHasCriticalPermissions true to allow the app to resume normally.

BUG=22347017

Change-Id: I6b9bdd02382d071530529a08e8f8fe7faf02fe3b

8 years agoam e2a6302c: am b462c3ca: am f2bdf276: am c2d5d078: Restrict permission checks to...
Alan Newberger [Wed, 8 Jul 2015 18:51:59 +0000 (18:51 +0000)]
am e2a6302c: am b462c3ca: am f2bdf276: am c2d5d078: Restrict permission checks to M devices

* commit 'e2a6302cc3e897b73c4dc8e629d2f747cf679390':
  Restrict permission checks to M devices

8 years agoam b462c3ca: am f2bdf276: am c2d5d078: Restrict permission checks to M devices
Alan Newberger [Wed, 8 Jul 2015 18:36:59 +0000 (18:36 +0000)]
am b462c3ca: am f2bdf276: am c2d5d078: Restrict permission checks to M devices

* commit 'b462c3ca45c1daafa1b2bb4461959b55734cf544':
  Restrict permission checks to M devices

8 years agoam f2bdf276: am c2d5d078: Restrict permission checks to M devices
Alan Newberger [Wed, 8 Jul 2015 18:19:47 +0000 (18:19 +0000)]
am f2bdf276: am c2d5d078: Restrict permission checks to M devices

* commit 'f2bdf2767617415e476ecab683e1fc05704174e7':
  Restrict permission checks to M devices

8 years agoam c2d5d078: Restrict permission checks to M devices
Alan Newberger [Wed, 8 Jul 2015 18:11:50 +0000 (18:11 +0000)]
am c2d5d078: Restrict permission checks to M devices

* commit 'c2d5d078821ca5e8de0c0d03b6603bf7c505c53f':
  Restrict permission checks to M devices

8 years agoRestrict permission checks to M devices
Alan Newberger [Wed, 8 Jul 2015 16:51:04 +0000 (09:51 -0700)]
Restrict permission checks to M devices

Add an ApiHelper check and only call checkSelfPermission if we
are on M and the methods exist.

BUG=22345681

Change-Id: Icda8d40057b5492502858ced731a749a2f66abf8

8 years agoam 342ebca3: (-s ours) am 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380779...
Geoff Mendal [Wed, 8 Jul 2015 13:44:40 +0000 (13:44 +0000)]
am 342ebca3: (-s ours) am 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE

* commit '342ebca36172e67dfcb6d7c96f61765ab4075d4f':
  Import translations. DO NOT MERGE

8 years agoam 0a8c14f8: (-s ours) am 03d7cde4: (-s ours) am a532005c: (-s ours) Import translati...
Geoff Mendal [Wed, 8 Jul 2015 13:44:39 +0000 (13:44 +0000)]
am 0a8c14f8: (-s ours) am 03d7cde4: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE

* commit '0a8c14f8b81dfb26ee11900c4ac5d0fae1f4a4f9':
  Import translations. DO NOT MERGE

8 years agoam 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380779: (-s ours) Import translati...
Geoff Mendal [Wed, 8 Jul 2015 13:31:15 +0000 (13:31 +0000)]
am 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE

* commit '3f3dfcb15b9d0dca041b935cc46946acbfa2ff06':
  Import translations. DO NOT MERGE

8 years agoam 03d7cde4: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:31:14 +0000 (13:31 +0000)]
am 03d7cde4: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE

* commit '03d7cde4c5ba0eb4195b7b91266ef10c3e85a574':
  Import translations. DO NOT MERGE

8 years agoam ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:24:12 +0000 (13:24 +0000)]
am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE

* commit 'ccb925b17d751735427c44e05acc871b02d0028e':
  Import translations. DO NOT MERGE

8 years agoam a532005c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:15:12 +0000 (13:15 +0000)]
am a532005c: (-s ours) Import translations. DO NOT MERGE

* commit 'a532005ce9d17b0d89a16ea94106cc3e9ca8b25c':
  Import translations. DO NOT MERGE

8 years agoam a5380779: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:13:52 +0000 (13:13 +0000)]
am a5380779: (-s ours) Import translations. DO NOT MERGE

* commit 'a5380779fdb646b295dd84a0db4cb48c0d98b63a':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:02:29 +0000 (06:02 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3e278d51be24e50c7b97e94929914bb982ff1ebe
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:01:30 +0000 (06:01 -0700)]
Import translations. DO NOT MERGE

Change-Id: I45b02325512d117d47e0aee868b0d13bc4538aa2
Auto-generated-cl: translation import

8 years agoam 2b4101fe: am ad44cda8: Minimum viable Android M runtime permissions handling for H.
zafir [Tue, 7 Jul 2015 02:21:44 +0000 (02:21 +0000)]
am 2b4101fe: am ad44cda8: Minimum viable Android M runtime permissions handling for H.

* commit '2b4101fe49818cc4b71105386820c9d753ca5aaa':
  Minimum viable Android M runtime permissions handling for H.

8 years agoam ad44cda8: Minimum viable Android M runtime permissions handling for H.
zafir [Tue, 7 Jul 2015 01:38:02 +0000 (01:38 +0000)]
am ad44cda8: Minimum viable Android M runtime permissions handling for H.

* commit 'ad44cda82fe6ec5ee090115129223c6314f9e1bb':
  Minimum viable Android M runtime permissions handling for H.

8 years agoMinimum viable Android M runtime permissions handling for H.
zafir [Mon, 29 Jun 2015 05:08:22 +0000 (00:08 -0500)]
Minimum viable Android M runtime permissions handling for H.

Creates new activity for permissions handling: both checking
for permissions and handling error condition when critical
permissions are not present. The reason for creating a
new activity is so the app does not attempt to continue
executing OnCreate, OnResume etc, which opens
the camera while the dialogs are showing. This should
not slow the app down because the permissions activity
will only run when a) the first time the app has
insufficient permissions and b) when a critical
permission is missing and the app needs to shut down.

Bug: 21273463
Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5

8 years agoam 1cef126a: am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera...
Alan Newberger [Mon, 29 Jun 2015 18:15:29 +0000 (18:15 +0000)]
am 1cef126a: am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala

* commit '1cef126a6de13b002f0caf55963fe0b48de00546':
  Ensure CaptureModule/API2 works without front camera

8 years agoam fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub...
Alan Newberger [Mon, 29 Jun 2015 18:06:04 +0000 (18:06 +0000)]
am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala

* commit 'fd6f316adc5abfa071534642688bdf46f47a3925':
  Ensure CaptureModule/API2 works without front camera

8 years agoam 245239ba: am 62240e14: Merge "Update filmstrip item on metadata update" into ub...
Alan Newberger [Mon, 29 Jun 2015 18:00:11 +0000 (18:00 +0000)]
am 245239ba: am 62240e14: Merge "Update filmstrip item on metadata update" into ub-camera-haleakala

* commit '245239baa8ac24036f05716af4b2739b254846f6':
  Update filmstrip item on metadata update