OSDN Git Service
Baligh Uddin [Wed, 4 May 2016 01:47:36 +0000 (01:47 +0000)]
Import translations. DO NOT MERGE am:
e1d30cc8b4 -s ours
am:
f127a35e6b -s ours
* commit '
f127a35e6bae24669989927355710a8d0f98f249':
Import translations. DO NOT MERGE
Change-Id: If737097fd30d2f78ebd100bd71256ecccea3eaec
Baligh Uddin [Wed, 4 May 2016 01:44:56 +0000 (01:44 +0000)]
Import translations. DO NOT MERGE
am:
e1d30cc8b4 -s ours
* commit '
e1d30cc8b4fb2dff49b3bbe74ffac97e0146d1ef':
Import translations. DO NOT MERGE
Change-Id: I0ae8570268d8d4f8d6af8639e3218e2912161217
Baligh Uddin [Wed, 4 May 2016 01:20:01 +0000 (18:20 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28463229
Change-Id: I16cdcbf53914ce960ba07adeabd5636e085dcce1
Ian Rogers [Tue, 3 May 2016 21:00:21 +0000 (21:00 +0000)]
Merge "Work around a type inference change in javac" am:
517383fcfe am:
bf1fb66391
am:
ceffdb43c5
* commit '
ceffdb43c5f6ce013790fe103c4a8a4f43d6bf55':
Work around a type inference change in javac
Change-Id: I8dfd4c3511c40a05962d635d22d2c077ceb11cc4
Ian Rogers [Tue, 3 May 2016 20:57:21 +0000 (20:57 +0000)]
Merge "Work around a type inference change in javac" am:
517383fcfe
am:
bf1fb66391
* commit '
bf1fb663914532d9bd7bf779d553e83f72f248d3':
Work around a type inference change in javac
Change-Id: If20b5129b9d5d198f8f2e85f02fe388146755574
Ian Rogers [Tue, 3 May 2016 20:54:27 +0000 (20:54 +0000)]
Merge "Work around a type inference change in javac"
am:
517383fcfe
* commit '
517383fcfe180b77ff95f5fd67d9a5d595481ea2':
Work around a type inference change in javac
Change-Id: I036df9c4963a37eb7ee482adc7c8452b7e9a951e
Ian Rogers [Tue, 3 May 2016 20:46:45 +0000 (20:46 +0000)]
Merge "Work around a type inference change in javac"
Ian Rogers [Sat, 30 Apr 2016 04:15:50 +0000 (21:15 -0700)]
Work around a type inference change in javac
Newer versions of javac have changes to type inference, fix to enable error
prone compile this module.
Bug:
27723540
Change-Id: I18518a8aa93bec8869e86b7b321048167a925514
Geoff Mendal [Sat, 19 Mar 2016 02:36:51 +0000 (02:36 +0000)]
Import translations. DO NOT MERGE
am:
edb8d5e -s ours
* commit '
edb8d5e88de263942f26cdac5a7008a609c69b34':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 19 Mar 2016 02:28:54 +0000 (03:28 +0100)]
Import translations. DO NOT MERGE
Change-Id: I903060275cd3c94f8af658366ada1495233e3d7e
Auto-generated-cl: translation import
Baligh Uddin [Sat, 27 Feb 2016 16:21:12 +0000 (16:21 +0000)]
Import translations. DO NOT MERGE
am:
fc4919f72c -s ours
* commit '
fc4919f72c3268010113218d5b90041a1762e543':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 27 Feb 2016 07:40:07 +0000 (23:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I294eb653321d2b53dd535ec6ec90c1d3f8660553
Baligh Uddin [Tue, 23 Feb 2016 16:46:23 +0000 (16:46 +0000)]
Import translations. DO NOT MERGE
am:
33291d352d -s ours
* commit '
33291d352d27086faa0b19220a921874b9a27737':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Feb 2016 16:32:32 +0000 (08:32 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I596131d7c0ab252212ddef71f1f3a2ad8f80f59f
Geoff Mendal [Mon, 8 Feb 2016 20:05:28 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE
am:
093c5159b9 -s ours
* commit '
093c5159b910d556ab80ce150a8475d0a951a556':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 16:22:26 +0000 (08:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2932b37f1b37c9002c90e60225847d45a6fad5e3
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 16:16:13 +0000 (16:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
9f10e59f05 -s ours
am:
f6aca0e8e2 -s ours
* commit '
f6aca0e8e22bb3ee8b0f45171d05b94a3d9fd460':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:01:54 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
9f10e59f05 -s ours
* commit '
9f10e59f055429d0bdb9e67b0ac928403ccfc75c':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 15:58:16 +0000 (15:58 +0000)]
Import translations. DO NOT MERGE am:
aead3d75a5 -s ours am:
3034de6ed9 -s ours
am:
7d39233d73 -s ours
* commit '
7d39233d733b8a98faf12808117d0afb69a800a7':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 15:53:09 +0000 (15:53 +0000)]
Import translations. DO NOT MERGE am:
aead3d75a5 -s ours
am:
3034de6ed9 -s ours
* commit '
3034de6ed95b8a9732ec3b5a9ea92d2353f89a6e':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 15:53:04 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 15:48:19 +0000 (15:48 +0000)]
Import translations. DO NOT MERGE
am:
aead3d75a5 -s ours
* commit '
aead3d75a584c8360b8b6de372d2413c3d04b174':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 15:46:54 +0000 (09:46 -0600)]
Import translations. DO NOT MERGE
Change-Id: I1ab274286dc0b66ac34d2c1adeee1dee4248e2df
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 15:37:35 +0000 (07:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3a7fa5c24d97c70b649e25ba341ffa9fdee66976
Auto-generated-cl: translation import
Geoff Mendal [Wed, 20 Jan 2016 13:04:59 +0000 (05:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibd7128b7e726f553b99dcafef2fb1fbe3d9e6756
Auto-generated-cl: translation import
Geoff Mendal [Mon, 18 Jan 2016 13:23:28 +0000 (05:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I649a79255d773685dd5ea7eb9d175385ca709e1f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 13 Jan 2016 13:19:16 +0000 (05:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie2453f2419eebb6f27a07b9d4850dead7bf67540
Auto-generated-cl: translation import
Geoff Mendal [Mon, 11 Jan 2016 13:07:12 +0000 (05:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9d2a7d1b793f8357c7ede3d9d4ee2431519c63d9
Auto-generated-cl: translation import
Geoff Mendal [Wed, 23 Dec 2015 13:17:11 +0000 (05:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0ba4a3d5732b35fcdfff0600512ec2f686dd30f8
Auto-generated-cl: translation import
Ying Wang [Wed, 16 Dec 2015 20:02:02 +0000 (20:02 +0000)]
Merge "Fix ProGuard errors." am:
a68b43450f
am:
3442b45c64
* commit '
3442b45c64ca338562bb6af830b7ccc860e57fe4':
Fix ProGuard errors.
Ying Wang [Wed, 16 Dec 2015 19:57:25 +0000 (19:57 +0000)]
Merge "Fix ProGuard errors."
am:
a68b43450f
* commit '
a68b43450f6e26aa61a7d47c785bf0b64f67b098':
Fix ProGuard errors.
Ying Wang [Wed, 16 Dec 2015 19:45:35 +0000 (19:45 +0000)]
Merge "Fix ProGuard errors."
Ying Wang [Wed, 16 Dec 2015 19:42:37 +0000 (11:42 -0800)]
Fix ProGuard errors.
Fix ProGuard error "library class references program class" and
references of org.apache.http.legacy symobls.
Change-Id: I3a6e915b08ca5eabfa863580f489e3bf6b968e9f
Geoff Mendal [Wed, 16 Dec 2015 13:31:34 +0000 (05:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfde3b57d5312613e762db5fbd6d3ae4e89b4cc2
Auto-generated-cl: translation import
Geoff Mendal [Mon, 14 Dec 2015 13:16:53 +0000 (05:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie9c85a5ce22a3d402ed2fe66306c818765eafc6a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 2 Dec 2015 13:03:49 +0000 (05:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7835608a1c2ade8d47ddbb82eddec4a1bc99b0a0
Auto-generated-cl: translation import
Geoff Mendal [Mon, 30 Nov 2015 13:18:27 +0000 (05:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I242cbdd7b8b40b543b9a4de85100f5785177963f
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Nov 2015 13:37:00 +0000 (05:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ice057df8e570d7b5c81b4f5daead58797a34b883
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 13:47:39 +0000 (05:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: I718d2cc5a8262fafce90c28f02226f0a030fbeaf
Auto-generated-cl: translation import
Baligh Uddin [Sat, 7 Nov 2015 15:26:13 +0000 (15:26 +0000)]
Import translations. DO NOT MERGE am:
7f064379fe -s ours
am:
ab84ba032f -s ours
* commit '
ab84ba032f74cc7406a68a83a47dfc2cb720f1af':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 20:00:14 +0000 (20:00 +0000)]
Import translations. DO NOT MERGE
am:
7f064379fe -s ours
* commit '
7f064379fe72ac4caf50986d4fed1f4b123ee640':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 00:43:37 +0000 (16:43 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: Ia65a3bccda29d3002d6807d632055e3fb74a545b
Geoff Mendal [Wed, 4 Nov 2015 13:32:36 +0000 (05:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I53b5edf9fbce737f126c4d02d8387964e3132f1e
Auto-generated-cl: translation import
Dan Willemsen [Mon, 2 Nov 2015 20:43:21 +0000 (20:43 +0000)]
Merge "Don\'t add BUILD_NUMBER to version for platform builds" am:
dc848bee84
am:
2ec617019e
* commit '
2ec617019e09f89bbb3bdaa6fcece37f536fce38':
Don't add BUILD_NUMBER to version for platform builds
Dan Willemsen [Mon, 2 Nov 2015 20:35:05 +0000 (20:35 +0000)]
Merge "Don\'t add BUILD_NUMBER to version for platform builds"
am:
dc848bee84
* commit '
dc848bee84bb8e578a53ba1d4d35071321490e60':
Don't add BUILD_NUMBER to version for platform builds
Dan Willemsen [Mon, 2 Nov 2015 20:29:55 +0000 (20:29 +0000)]
Merge "Don't add BUILD_NUMBER to version for platform builds"
Dan Willemsen [Wed, 28 Oct 2015 23:45:38 +0000 (16:45 -0700)]
Don't add BUILD_NUMBER to version for platform builds
We're removing differences between two builds that have the same source.
These builds will have different BUILD_NUMBERs though, so it shouldn't
be embedded in the binary.
For eng builds, using the current date forces the APK to be rebuilt
every time the makefiles are read. Remove this for platform builds, but
keep it if building unbundled.
Bug:
24201956
Change-Id: Ib5696a8e5867a6a19b7abdc7d4e5e51037fc4a33
Geoff Mendal [Mon, 19 Oct 2015 12:13:11 +0000 (07:13 -0500)]
Import translations. DO NOT MERGE
Change-Id: I3006eb6af56c16310f3e160221632a546eb0d7f9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Oct 2015 13:54:37 +0000 (06:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idaab9fed6e2600be067b1c24a0cccda7738af57a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Oct 2015 12:47:09 +0000 (05:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I58fc505e8722bdb37792e180058ec40dc44fd44e
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 14:57:39 +0000 (14:57 +0000)]
am
2f15355b: (-s ours) am
e055bcff: (-s ours) Import translations. DO NOT MERGE
* commit '
2f15355b1804ed9f73bf8b7c58ae85b38f52e358':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Sep 2015 14:50:10 +0000 (14:50 +0000)]
am
e055bcff: (-s ours) Import translations. DO NOT MERGE
* commit '
e055bcff670b6d1ec7e24cb7f007916b1091cb08':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Sep 2015 09:22:25 +0000 (02:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I02cf06ec022cfa1e56fe03cdb62f9cada59c1902
Auto-generated-cl: translation import
Baligh Uddin [Sun, 27 Sep 2015 23:24:00 +0000 (23:24 +0000)]
am
dd288752: (-s ours) am
0a7aca40: (-s ours) am
1ec43279: (-s ours) am
096a45a6: (-s ours) Import translations. DO NOT MERGE
* commit '
dd28875208314fd91463ef574451adf1c18a3b51':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 23:15:47 +0000 (23:15 +0000)]
am
0a7aca40: (-s ours) am
1ec43279: (-s ours) am
096a45a6: (-s ours) Import translations. DO NOT MERGE
* commit '
0a7aca406cfc19fcf0ba65ee720d058cf2808121':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 22:37:22 +0000 (22:37 +0000)]
am
1ec43279: (-s ours) am
096a45a6: (-s ours) Import translations. DO NOT MERGE
* commit '
1ec4327910ae7b92d690b7f8ed2fefb0640225c6':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 04:09:31 +0000 (04:09 +0000)]
am
096a45a6: (-s ours) Import translations. DO NOT MERGE
* commit '
096a45a67ca693804beca3aa50a1e9975afbe46d':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 26 Sep 2015 16:11:39 +0000 (09:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie2eb569fc4b41e3639b81af4d84a52ec564cd662
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 17:29:22 +0000 (10:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie663db2645a965c239e550177d3c03814843b242
Auto-generated-cl: translation import
Baligh Uddin [Sat, 19 Sep 2015 18:18:10 +0000 (18:18 +0000)]
am
1223327a: (-s ours) am
cb7d6d5c: (-s ours) am
4318c12c: (-s ours) am
c153cb57: (-s ours) Import translations. DO NOT MERGE
* commit '
1223327ae2b5f71ff9a6e321e0d77a094dcb2792':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:25:31 +0000 (03:25 +0000)]
am
cb7d6d5c: (-s ours) am
4318c12c: (-s ours) am
c153cb57: (-s ours) Import translations. DO NOT MERGE
* commit '
cb7d6d5c7092f548831ae5c69edc58c742a82be3':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:13:49 +0000 (03:13 +0000)]
am
4318c12c: (-s ours) am
c153cb57: (-s ours) Import translations. DO NOT MERGE
* commit '
4318c12c3c0a84f8f434c4b24917e8fc33af2d25':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:04:42 +0000 (03:04 +0000)]
am
c153cb57: (-s ours) Import translations. DO NOT MERGE
* commit '
c153cb57f2de82fa6ed7ad01de516724f007bed0':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 18 Sep 2015 23:01:09 +0000 (16:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie210e470536721f3d8dbe0f44620e5e7c7bfbb26
Auto-generated-cl: translation import
Geoff Mendal [Mon, 7 Sep 2015 13:44:15 +0000 (06:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I17eb0b862d19df33c44e48b0924a31d6fb013359
Auto-generated-cl: translation import
Geoff Mendal [Mon, 31 Aug 2015 13:36:46 +0000 (06:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa55381531e32a1f2952f118d13679daf15e9f53
Auto-generated-cl: translation import
Alan Newberger [Thu, 27 Aug 2015 14:41:11 +0000 (14:41 +0000)]
am
da4c3a1f: am
4a440fb9: (-s ours) am
431be7f8: am
c8594ddf: Check for zero length array returns
* commit '
da4c3a1fa91a539fa90f778ce2bf4ad1cb2fd2fa':
Dianne Hackborn [Thu, 27 Aug 2015 14:41:10 +0000 (14:41 +0000)]
am
53cbd8de: am
ac8c7e95: (-s ours) am
ef0b96ce: Change MNC codename to just M.
* commit '
53cbd8deea717569ca0b77ebf98eae8a39827b9a':
Geoff Mendal [Thu, 27 Aug 2015 14:41:09 +0000 (14:41 +0000)]
am
00c17b87: (-s ours) am
89c7b1a4: (-s ours) am
822b0367: (-s ours) am
51a59c80: (-s ours) am
a94d0f6f: (-s ours) Import translations. DO NOT MERGE
* commit '
00c17b877ae7eab891b43319acf606e08b9064a8':
Geoff Mendal [Thu, 27 Aug 2015 14:41:08 +0000 (14:41 +0000)]
am
16cb3721: (-s ours) am
971017ca: (-s ours) am
ff24828e: (-s ours) am
0b9400ac: (-s ours) Import translations. DO NOT MERGE
* commit '
16cb37212267e63e78fd83f377df035f5feb35fe':
Alan Newberger [Thu, 27 Aug 2015 14:41:07 +0000 (14:41 +0000)]
am
8c137a59: am
b209dc21: (-s ours) am
5bbf8748: am
30339719: Remove unused ACCOUNTS permissions
* commit '
8c137a59694906bf3a03bc1570f1fd9f2d84c6f3':
Alan Newberger [Thu, 27 Aug 2015 14:41:06 +0000 (14:41 +0000)]
am
dcea53ae: am
fed0e130: (-s ours) am
151f74fc: am
4df3011e: Protect against destroying uncreated values
* commit '
dcea53aee6db2511e502fc7d250998568815c3d7':
Sascha Haeberling [Thu, 27 Aug 2015 14:41:05 +0000 (14:41 +0000)]
am
4037c900: am
72817779: (-s ours) am
1aaec6c0: am
ae474d0b: [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.
* commit '
4037c900ad8826419522442fcb151d552f53cc4d':
Colin Cross [Thu, 27 Aug 2015 14:41:02 +0000 (14:41 +0000)]
am
aa409401: am
e7ef368b: (-s ours) am
42efa85d: Merge "Use build number from file"
* commit '
aa4094010bc85d8db9cd7c2f3594bfdda2c69d61':
zafir [Thu, 27 Aug 2015 14:40:58 +0000 (14:40 +0000)]
zafir [Thu, 27 Aug 2015 14:40:54 +0000 (14:40 +0000)]
am
e536e5cc: am
7c6c5920: (-s ours) am
e65f51f5: am
dd334be9: Camera M permissions: lockscreen improvements
* commit '
e536e5cc3fa0871a0cdc1fa57038e2a9d1a2060f':
Geoff Mendal [Thu, 27 Aug 2015 14:40:53 +0000 (14:40 +0000)]
am
d9c16af5: (-s ours) am
c4cf6d5f: (-s ours) am
ede11beb: (-s ours) am
34663b0f: (-s ours) am
36c35f23: (-s ours) Import translations. DO NOT MERGE
* commit '
d9c16af5a202f8bfe23114da01032612d6e9baf5':
Geoff Mendal [Thu, 27 Aug 2015 14:40:51 +0000 (14:40 +0000)]
am
1205ac9e: (-s ours) am
20209a04: (-s ours) am
5449f0fd: (-s ours) am
62f7a266: (-s ours) Import translations. DO NOT MERGE
* commit '
1205ac9e804ef6a0fa6e2e0639a7376da80c570c':
Geoff Mendal [Thu, 27 Aug 2015 14:40:50 +0000 (14:40 +0000)]
am
7238eefa: (-s ours) am
be5918ba: (-s ours) am
a95faf78: (-s ours) Import translations. DO NOT MERGE
* commit '
7238eefa4b2a225e7fe98a85442993da79b6b3f1':
Geoff Mendal [Thu, 27 Aug 2015 14:40:48 +0000 (14:40 +0000)]
am
7be68b1d: (-s ours) am
3b3f362c: (-s ours) am
498af6a5: (-s ours) am
ca7f4ce9: (-s ours) am
ec5a5213: (-s ours) Import translations. DO NOT MERGE
* commit '
7be68b1d4e5ece03dacc6374f6cc84320bab700a':
Geoff Mendal [Thu, 27 Aug 2015 14:40:47 +0000 (14:40 +0000)]
am
8ee36d26: (-s ours) am
5d73cf77: (-s ours) am
4e3575eb: (-s ours) am
4c77d6a7: (-s ours) Import translations. DO NOT MERGE
* commit '
8ee36d26ac32590c93cf1e37e8a97370f4b2b803':
Alan Newberger [Thu, 27 Aug 2015 14:40:46 +0000 (14:40 +0000)]
am
8fbd592b: am
ebe070e1: (-s ours) am
cc4f1804: am
6bb610be: am
ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala
* commit '
8fbd592b6bab5acf02baf49f3b46f3f5394e8cc7':
Geoff Mendal [Thu, 27 Aug 2015 14:40:45 +0000 (14:40 +0000)]
am
02102ece: (-s ours) am
b919d6a9: (-s ours) am
f3eb023d: (-s ours) am
50f8944c: (-s ours) am
1ac1ac74: (-s ours) Import translations. DO NOT MERGE
* commit '
02102ece08c08cce8a4d551dd1c84837c400d56d':
Geoff Mendal [Thu, 27 Aug 2015 14:40:43 +0000 (14:40 +0000)]
am
2a12d498: (-s ours) am
518d5e32: (-s ours) am
eb29ae19: (-s ours) am
45289c3d: (-s ours) Import translations. DO NOT MERGE
* commit '
2a12d4987e1a5c73022dc0d2153f45c6a13cd1ad':
Geoff Mendal [Thu, 27 Aug 2015 14:40:42 +0000 (14:40 +0000)]
am
9747f84d: (-s ours) am
cfa5798d: (-s ours) am
0e58fb83: (-s ours) Import translations. DO NOT MERGE
* commit '
9747f84d38fd2c76e3d15331d62a68a24434fe28':
Geoff Mendal [Thu, 27 Aug 2015 14:40:40 +0000 (14:40 +0000)]
am
6a49f18d: (-s ours) am
55db89fb: (-s ours) am
57b4d24e: (-s ours) am
09364eeb: (-s ours) am
b980a5be: (-s ours) Import translations. DO NOT MERGE
* commit '
6a49f18dafd829d0de18030371af5e7fb47150d4':
Geoff Mendal [Thu, 27 Aug 2015 14:40:29 +0000 (14:40 +0000)]
am
6fdc1c51: (-s ours) am
ecebd474: (-s ours) am
5d806912: (-s ours) am
e27c079d: (-s ours) Import translations. DO NOT MERGE
* commit '
6fdc1c51e56be2e0ca0257073bf1f49af883f338':
Geoff Mendal [Thu, 27 Aug 2015 14:40:27 +0000 (14:40 +0000)]
am
1d5ae08c: (-s ours) am
e106bb8c: (-s ours) am
0462d5b1: (-s ours) Import translations. DO NOT MERGE
* commit '
1d5ae08cd38c4356596de0406b586730f05a0498':
Alan Newberger [Thu, 27 Aug 2015 14:40:25 +0000 (14:40 +0000)]
am
cda6f851: am
ff089ce0: (-s ours) am
c9b45d41: am
01c3f7ad: am
e25f675a: Shorten location startup dialog string
* commit '
cda6f85195fbc114a773e379d9bc4f3958a84924':
Alan Newberger [Thu, 27 Aug 2015 14:40:23 +0000 (14:40 +0000)]
am
f710bef2: am
b4e6a7b5: (-s ours) am
ade8896d: am
2fc4970c: am
00720781: Null check when evaluating valid resolution size
* commit '
f710bef2a9e0b35bc4e5bd3da6b75003142ad639':
zafir [Thu, 27 Aug 2015 14:40:21 +0000 (14:40 +0000)]
am
43a659aa: am
4e7cb0d6: (-s ours) am
dfd3ecb1: am
148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
* commit '
43a659aad9f6a11b6b00037dd87cbdfde9beb3dc':
Alan Newberger [Thu, 27 Aug 2015 14:40:19 +0000 (14:40 +0000)]
am
558a6f2a: am
2d59acf2: (-s ours) am
6e0e81f3: am
5c8c7d3c: Clear permissions check after successful PermissionsActivity
* commit '
558a6f2a0950a5f4f5c43daa01d21afa50f277bc':
Alan Newberger [Thu, 27 Aug 2015 14:40:17 +0000 (14:40 +0000)]
am
6cd53129: am
2dc18897: (-s ours) am
f2bdf276: am
c2d5d078: Restrict permission checks to M devices
* commit '
6cd53129083b1a41dad968912db308b5ecbbd6da':
Geoff Mendal [Thu, 27 Aug 2015 14:40:15 +0000 (14:40 +0000)]
am
d347c8a1: (-s ours) am
e91f7eef: (-s ours) am
ccb925b1: (-s ours) am
a5380779: (-s ours) Import translations. DO NOT MERGE
* commit '
d347c8a17aafc0c3b6cc78248b3bee0a47416bd6':
Geoff Mendal [Thu, 27 Aug 2015 14:40:13 +0000 (14:40 +0000)]
am
5186a9ff: (-s ours) am
212962d0: (-s ours) am
a532005c: (-s ours) Import translations. DO NOT MERGE
* commit '
5186a9ff591bd5814408053e798bf79661c93266':
zafir [Thu, 27 Aug 2015 14:40:11 +0000 (14:40 +0000)]
am
86c80498: am
32360bba: (-s ours) am
2b4101fe: am
ad44cda8: Minimum viable Android M runtime permissions handling for H.
* commit '
86c8049837d18eda2a6a2a12d780bb7a2731edba':
Alan Newberger [Thu, 27 Aug 2015 11:19:29 +0000 (11:19 +0000)]
am
4a440fb9: (-s ours) am
431be7f8: am
c8594ddf: Check for zero length array returns
* commit '
4a440fb905b4bc560752b94bd136b025940552ce':
Dianne Hackborn [Thu, 27 Aug 2015 11:19:28 +0000 (11:19 +0000)]
am
ac8c7e95: (-s ours) am
ef0b96ce: Change MNC codename to just M.
* commit '
ac8c7e95d3207ff7b5c0c8a92f0a25eb97a93890':
Geoff Mendal [Thu, 27 Aug 2015 11:19:28 +0000 (11:19 +0000)]
am
89c7b1a4: (-s ours) am
822b0367: (-s ours) am
51a59c80: (-s ours) am
a94d0f6f: (-s ours) Import translations. DO NOT MERGE
* commit '
89c7b1a4f17281ba925216f9313ca1bef96cdf31':
Geoff Mendal [Thu, 27 Aug 2015 11:19:27 +0000 (11:19 +0000)]
am
971017ca: (-s ours) am
ff24828e: (-s ours) am
0b9400ac: (-s ours) Import translations. DO NOT MERGE
* commit '
971017cacf7f4da41ea6f51232869708f1c04dac':