OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 38f33925f8 -s ours
Geoff Mendal [Wed, 3 Feb 2016 12:03:36 +0000 (12:03 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 38f33925f8  -s ours
am: 0ba5990d99  -s ours

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

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:58:11 +0000 (11:58 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: e6faf1a713 -s ours
Geoff Mendal [Wed, 3 Feb 2016 11:55:09 +0000 (11:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: e6faf1a713  -s ours
am: f80ebaf32e  -s ours

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

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:54:16 +0000 (11:54 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: e6faf1a713 -s ours
Geoff Mendal [Wed, 3 Feb 2016 11:50:07 +0000 (11:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: e6faf1a713  -s ours
am: f80ebaf32e  -s ours

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

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:49:12 +0000 (11:49 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: fba9bae4d1 -s ours
Geoff Mendal [Wed, 3 Feb 2016 11:44:51 +0000 (11:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: fba9bae4d1  -s ours
am: 4b4d63c3a5  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: fba9bae4d1 -s ours
Geoff Mendal [Wed, 3 Feb 2016 11:41:05 +0000 (11:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: fba9bae4d1  -s ours
am: 4b4d63c3a5  -s ours

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

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:36:34 +0000 (11:36 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:32:37 +0000 (11:32 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 6779c7d415 -s ours
Geoff Mendal [Wed, 3 Feb 2016 11:32:12 +0000 (11:32 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 6779c7d415  -s ours
am: 87c4199600  -s ours

* commit '87c4199600dcc6933abffa8bc9c04abf52483575':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 6779c7d415 -s ours
Geoff Mendal [Wed, 3 Feb 2016 11:29:36 +0000 (11:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 6779c7d415  -s ours
am: 87c4199600  -s ours

* commit '87c4199600dcc6933abffa8bc9c04abf52483575':
  Import translations. DO NOT MERGE

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:29:03 +0000 (11:29 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: c0297abd93 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 11:25:16 +0000 (11:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: c0297abd93  -s ours am: 768b07ca66  -s ours
am: 4c3e6f2a53  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: c0297abd93 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 11:22:48 +0000 (11:22 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: c0297abd93  -s ours am: 768b07ca66  -s ours
am: 4c3e6f2a53  -s ours

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

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:21:15 +0000 (11:21 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 11:19:55 +0000 (11:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5  -s ours am: b1be124b15  -s ours
am: 3350974f82  -s ours

* commit '3350974f82c7743e204d57f5f19b554e67bdad63':
  Import translations. DO NOT MERGE

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:18:49 +0000 (11:18 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 11:17:36 +0000 (11:17 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5  -s ours am: b1be124b15  -s ours
am: 3350974f82  -s ours

* commit '3350974f82c7743e204d57f5f19b554e67bdad63':
  Import translations. DO NOT MERGE

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:16:29 +0000 (11:16 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 11:11:14 +0000 (11:11 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8  -s ours am: a0159dfc08  -s ours
am: b8758b39a9  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 11:08:48 +0000 (11:08 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8  -s ours am: a0159dfc08  -s ours
am: b8758b39a9  -s ours

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

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:08:42 +0000 (11:08 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 1974686db5 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 11:05:45 +0000 (11:05 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 1974686db5  -s ours am: a85507482f  -s ours
am: d5668a4a88  -s ours

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

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:05:38 +0000 (11:05 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 1974686db5 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 11:03:41 +0000 (11:03 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 1974686db5  -s ours am: a85507482f  -s ours
am: d5668a4a88  -s ours

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

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 11:03:38 +0000 (11:03 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c -s ours...
Geoff Mendal [Wed, 3 Feb 2016 11:00:08 +0000 (11:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c  -s ours am: 4d79bcf457  -s ours
am: a6f5fe64f4  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Wed, 3 Feb 2016 11:00:03 +0000 (11:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 38f33925f8  -s ours

* commit '38f33925f87a0d705e4b0f3c2959978368a9c0b6':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c -s ours...
Geoff Mendal [Wed, 3 Feb 2016 10:59:15 +0000 (10:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c  -s ours am: 4d79bcf457  -s ours
am: a6f5fe64f4  -s ours

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

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 10:57:28 +0000 (10:57 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Wed, 3 Feb 2016 10:56:37 +0000 (10:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: e6faf1a713  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 10:56:31 +0000 (10:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3  -s ours am: aa7e0396c9  -s ours
am: b8783e5933  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 10:54:21 +0000 (10:54 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3  -s ours am: aa7e0396c9  -s ours
am: b8783e5933  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Wed, 3 Feb 2016 10:54:05 +0000 (10:54 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: fba9bae4d1  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Wed, 3 Feb 2016 10:49:28 +0000 (10:49 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 6779c7d415  -s ours

* commit '6779c7d41583a01ca304543979d3d5a90af5cc57':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b697973e2a -s ours...
Geoff Mendal [Wed, 3 Feb 2016 10:48:05 +0000 (10:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b697973e2a  -s ours am: 0291cf7113  -s ours
am: 3cddac44fd  -s ours

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

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 10:47:14 +0000 (10:47 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 21e0a012d8 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 10:46:02 +0000 (10:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 21e0a012d8  -s ours am: 008f7facbe  -s ours
am: 6332ec3317  -s ours

* commit '6332ec33172816b2653f82ef70575af478f306ec':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: c0297abd93 -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:46:00 +0000 (10:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: c0297abd93  -s ours
am: 768b07ca66  -s ours

* commit '768b07ca66e9a0780e17d3d8542b601e2ffc2771':
  Import translations. DO NOT MERGE

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Geoff Mendal [Wed, 3 Feb 2016 10:45:34 +0000 (10:45 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb -s ours...
Geoff Mendal [Wed, 3 Feb 2016 10:44:23 +0000 (10:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb  -s ours am: abaebda3ff  -s ours
am: 381c7ce4ed  -s ours

* commit '381c7ce4ed857113d838743d7de224fab021e278':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb -s ours...
Geoff Mendal [Wed, 3 Feb 2016 10:43:31 +0000 (10:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb  -s ours am: abaebda3ff  -s ours
am: 381c7ce4ed  -s ours

* commit '381c7ce4ed857113d838743d7de224fab021e278':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5 -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:43:24 +0000 (10:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5  -s ours
am: b1be124b15  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 9561ec3353 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 10:40:53 +0000 (10:40 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 9561ec3353  -s ours am: 6dfc27dac9  -s ours
am: e521419909  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8 -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:40:41 +0000 (10:40 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8  -s ours
am: a0159dfc08  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 6f63adbe93 -s ours...
Geoff Mendal [Wed, 3 Feb 2016 10:39:25 +0000 (10:39 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 6f63adbe93  -s ours am: 79d8d1a13f  -s ours
am: 84f4b8a84a  -s ours

* commit '84f4b8a84a00339d2a2f0561e07d475401bc2915':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 1974686db5 -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:38:09 +0000 (10:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 1974686db5  -s ours
am: a85507482f  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 26b12b719d -s ours...
Geoff Mendal [Wed, 3 Feb 2016 10:37:51 +0000 (10:37 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 26b12b719d  -s ours am: c2ca962f06  -s ours
am: 854926febb  -s ours

* commit '854926febbc7f78a161adc21db6dd4996d34aa7d':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:37:05 +0000 (10:37 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c  -s ours
am: 4d79bcf457  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3 -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:36:01 +0000 (10:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3  -s ours
am: aa7e0396c9  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b697973e2a -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:35:02 +0000 (10:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b697973e2a  -s ours
am: 0291cf7113  -s ours

* commit '0291cf7113023c58a02110e8a4f7e191d37510ca':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 21e0a012d8 -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:33:55 +0000 (10:33 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 21e0a012d8  -s ours
am: 008f7facbe  -s ours

* commit '008f7facbed95e67cf45ff81013b83e7f44c54aa':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:32:50 +0000 (10:32 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb  -s ours
am: abaebda3ff  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 9561ec3353 -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:31:45 +0000 (10:31 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 9561ec3353  -s ours
am: 6dfc27dac9  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 6f63adbe93 -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:30:38 +0000 (10:30 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 6f63adbe93  -s ours
am: 79d8d1a13f  -s ours

* commit '79d8d1a13f719edb5238972ab6123643cf911146':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 26b12b719d -s ours
Geoff Mendal [Wed, 3 Feb 2016 10:29:24 +0000 (10:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 26b12b719d  -s ours
am: c2ca962f06  -s ours

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

8 years agoMerge "Enable profile support for apps with shared runtime"
Calin Juravle [Wed, 3 Feb 2016 10:03:24 +0000 (10:03 +0000)]
Merge "Enable profile support for apps with shared runtime"

8 years agoMove DHCPv4 mechanics into IpManager
Erik Kline [Wed, 3 Feb 2016 08:44:13 +0000 (08:44 +0000)]
Move DHCPv4 mechanics into IpManager
am: 8afa558c52

* commit '8afa558c527b4be4e0e489b17485577e23148636':
  Move DHCPv4 mechanics into IpManager

8 years agoMove DHCPv4 mechanics into IpManager
Erik Kline [Tue, 2 Feb 2016 04:06:21 +0000 (13:06 +0900)]
Move DHCPv4 mechanics into IpManager

Bug: 17345682
Change-Id: I2c3d9d665ff3c38f02084c0cf86cd76035e7b0aa

8 years agoRename confusing animation naming.
Tomasz Mikolajewski [Wed, 3 Feb 2016 07:53:21 +0000 (16:53 +0900)]
Rename confusing animation naming.

The naming was ANIM_UP, ANIM_DOWN, but the animations were from right and
left. Since right and left are flipped for RTL, this CL renames them
with direction agnostic ANIM_ENTER and ANIM_LEAVE.

Change-Id: I8de1603b1baaef3d4ba8fbd593f5e53143698dff

8 years agoMerge "Fix directory/root opening animations when launching DocumentsUI."
Tomasz Mikolajewski [Wed, 3 Feb 2016 08:05:18 +0000 (08:05 +0000)]
Merge "Fix directory/root opening animations when launching DocumentsUI."

8 years agoFix directory/root opening animations when launching DocumentsUI.
Tomasz Mikolajewski [Wed, 3 Feb 2016 06:49:58 +0000 (15:49 +0900)]
Fix directory/root opening animations when launching DocumentsUI.

We should only show an opening animation, when back button would get us
back.

Change-Id: I9b3f43592a87c1c13944d382b7201b5727fd08ee

8 years agoMerge "Do not load Download roots multiple times."
Tomasz Mikolajewski [Wed, 3 Feb 2016 07:02:31 +0000 (07:02 +0000)]
Merge "Do not load Download roots multiple times."

8 years agoMerge "Move logic to skip single storage."
Daichi Hirono [Wed, 3 Feb 2016 06:54:44 +0000 (06:54 +0000)]
Merge "Move logic to skip single storage."

8 years agoMove logic to skip single storage.
Daichi Hirono [Tue, 2 Feb 2016 07:35:03 +0000 (16:35 +0900)]
Move logic to skip single storage.

The tree structure of MTP model looks like /device/storage/objects. But
almost all MTP device has only single storage, so it's redundant to show
a single storage as a child of device in UI.

MtpDocumentsProvider has a special logic to skip single storage, and
shows storage's object as a children of device in such case. Previously
the logic was applied when MtpDocumentsProvider returned a root
list. The provider returns a storage as a Documents.Root, instead of
device if the device has only one storage.

However the number of root cannot be obtain for closed device. Thus the
previous logic did not work for closed devices that have a single
storage. The CL moves the logic from queryRoot to
queryChildDocuments. Now MtpDocumentsProvider always returns a device as
root, then it returns storage's objects as the device's children, where
we has already opened the device.

BUG=26481574

Change-Id: I25af0fc220410e321a378d67f226798ec4bba19c

8 years agoDo not load Download roots multiple times.
Tomasz Mikolajewski [Wed, 3 Feb 2016 06:18:22 +0000 (15:18 +0900)]
Do not load Download roots multiple times.

Change-Id: I26685db7fc7a4fb98db695ba6e0e351974eadd6c

8 years agoHide DocumentsContract.FLAG_ARCHIVE.
Tomasz Mikolajewski [Mon, 1 Feb 2016 04:01:34 +0000 (13:01 +0900)]
Hide DocumentsContract.FLAG_ARCHIVE.

The API is internal for now.

Bug: 20176812
Change-Id: I9f2c796b144906fdf4a838240c85d26f02dbe175

8 years agoMerge "Window resize reporting improvement when docked stack is created"
Wale Ogunwale [Wed, 3 Feb 2016 03:25:59 +0000 (03:25 +0000)]
Merge "Window resize reporting improvement when docked stack is created"

8 years agoMerge "Open zip files nicely from the Download app with Files app."
Tomasz Mikolajewski [Wed, 3 Feb 2016 03:20:11 +0000 (03:20 +0000)]
Merge "Open zip files nicely from the Download app with Files app."

8 years agoWindow resize reporting improvement when docked stack is created
Wale Ogunwale [Tue, 2 Feb 2016 04:25:54 +0000 (20:25 -0800)]
Window resize reporting improvement when docked stack is created

There were a few issues with window resize reporting when a docked
stack is created that caused the client to get frames for fulscreen
even though the task was in split-screen mode.

- Ignore docked stack visibility when get bounds for other stack when
resizing due to docked stack.
- Immediately resize all other stacks in activity manager when the
docked stack is attached to the display.
- Defer surface layouts for the uncheck portion of moving a task to a
stack.
- Don't perform layout of all windows on a display when a stack is
attached to the display since it doesn't have any windows yet.

Bug: 26861802
Change-Id: I2c7f31153da48618e90607c98ec5b29492b6ef38

8 years agoMerge "Improved timing of when system sends multi-window change event to app"
Wale Ogunwale [Wed, 3 Feb 2016 03:15:16 +0000 (03:15 +0000)]
Merge "Improved timing of when system sends multi-window change event to app"

8 years agoImproved timing of when system sends multi-window change event to app
Wale Ogunwale [Mon, 1 Feb 2016 18:32:02 +0000 (10:32 -0800)]
Improved timing of when system sends multi-window change event to app

We were previously sending multi-window/PiP mode changed events to
apps once the task config is changed in activity manager.
However, the actual changing of the multi-windowing or PiP mode
might not be fully complete when the app receives the event so they
might be wrong state information they query for like currnet config.
We now schedule the events to be send once the current transaction
cycle is done.

Bug: 26877409
Change-Id: I393b56035bb4197f99b3db3d27c0599835b5f86c

8 years agoOpen zip files nicely from the Download app with Files app.
Tomasz Mikolajewski [Wed, 27 Jan 2016 08:36:51 +0000 (17:36 +0900)]
Open zip files nicely from the Download app with Files app.

Bug: 26321218
Change-Id: I8a7a7e914d290ea1b6f424ee5fbd38a4b09c362d

8 years agoMerge "Recycle TypedArray in LockPatternView"
Jim Miller [Wed, 3 Feb 2016 02:55:36 +0000 (02:55 +0000)]
Merge "Recycle TypedArray in LockPatternView"

8 years agoRecycle TypedArray in LockPatternView
Jim Miller [Wed, 3 Feb 2016 02:12:30 +0000 (18:12 -0800)]
Recycle TypedArray in LockPatternView

Fixes bug 26734012

Change-Id: Ic15908f9aa6940f8c53a47c160c92f6f4648cc61

8 years agoMerge changes from topic 'API renaming'
Lifu Tang [Wed, 3 Feb 2016 02:08:28 +0000 (02:08 +0000)]
Merge changes from topic 'API renaming'

* changes:
  Worked around the crash caused by API renaming
  Rename Gps to Gnss for measurement-related APIs

8 years agoMerge "Fix flaky testFilesList_LiveUpdate()."
Tomasz Mikolajewski [Wed, 3 Feb 2016 02:08:15 +0000 (02:08 +0000)]
Merge "Fix flaky testFilesList_LiveUpdate()."

8 years agoMerge "Fix tapping on more than one failure notification."
Tomasz Mikolajewski [Wed, 3 Feb 2016 02:05:23 +0000 (02:05 +0000)]
Merge "Fix tapping on more than one failure notification."

8 years agoFix tapping on more than one failure notification.
Tomasz Mikolajewski [Mon, 1 Feb 2016 03:01:14 +0000 (12:01 +0900)]
Fix tapping on more than one failure notification.

Bug: 26809248
Change-Id: I4e52b7e7a9e09d57b8a2231a09c9121b5fd19e51

8 years agoMerge "Ignore unknown user restrictions and WTF instead."
Makoto Onuki [Wed, 3 Feb 2016 01:38:33 +0000 (01:38 +0000)]
Merge "Ignore unknown user restrictions and WTF instead."

8 years agoMerge "Slightly change the "pre-N" so it's CTS-friendly."
Makoto Onuki [Wed, 3 Feb 2016 01:31:24 +0000 (01:31 +0000)]
Merge "Slightly change the "pre-N" so it's CTS-friendly."

8 years agoWorked around the crash caused by API renaming
Lifu Tang [Wed, 3 Feb 2016 01:25:32 +0000 (17:25 -0800)]
Worked around the crash caused by API renaming

Bug: 26885642
Change-Id: I1f1ad76d18444d5f250397ef491e1dd4858f0a1d

8 years agoSlightly change the "pre-N" so it's CTS-friendly.
Makoto Onuki [Wed, 3 Feb 2016 01:24:59 +0000 (17:24 -0800)]
Slightly change the "pre-N" so it's CTS-friendly.

Right now, the value of VERSION_CODES.N is 10000, but I'm writing
a caller app with target SDK level 24 for CTS, and the previous
logic didn't work for it.

Bug 25506830

Change-Id: I73613f30b437fb19406736f897d01d59b1f84c9d

8 years agoMerge "Fix root selection after search"
Aga Wronska [Wed, 3 Feb 2016 01:23:41 +0000 (01:23 +0000)]
Merge "Fix root selection after search"

8 years agoMerge "Early kickoff of shadow tasks"
Chris Craik [Wed, 3 Feb 2016 01:17:37 +0000 (01:17 +0000)]
Merge "Early kickoff of shadow tasks"

8 years agoMerge "Add new icon for fbe notification"
Jim Miller [Wed, 3 Feb 2016 01:12:36 +0000 (01:12 +0000)]
Merge "Add new icon for fbe notification"

8 years agoIgnore unknown user restrictions and WTF instead.
Makoto Onuki [Thu, 28 Jan 2016 19:32:32 +0000 (11:32 -0800)]
Ignore unknown user restrictions and WTF instead.

Bug 23902097

Change-Id: I1ac147ecd0286a8eb674d6f9f527edfea6e1198e

8 years agoEarly kickoff of shadow tasks
Chris Craik [Sat, 16 Jan 2016 00:15:30 +0000 (16:15 -0800)]
Early kickoff of shadow tasks

bug:26562703

Change-Id: I7cdf18f2c662380bd31c7ffeefd5c3f569e5c1c6

8 years agoAdd new icon for fbe notification
Jim Miller [Wed, 3 Feb 2016 01:08:56 +0000 (17:08 -0800)]
Add new icon for fbe notification

Fixes bug 26863369

Change-Id: I967d585fa251782d18a5f24c025b28d40268dc85

8 years agoMerge "AAPT2: Support -c configuration filtering"
Adam Lesinski [Wed, 3 Feb 2016 01:05:32 +0000 (01:05 +0000)]
Merge "AAPT2: Support -c configuration filtering"

8 years agoAAPT2: Support -c configuration filtering
Adam Lesinski [Wed, 3 Feb 2016 01:02:58 +0000 (17:02 -0800)]
AAPT2: Support -c configuration filtering

Change-Id: I1e5855ca73440bdc30c21bcbc1dfdd31a9842363

8 years agoMerge "Show view mode button in action bar on Downloads."
Steve McKay [Wed, 3 Feb 2016 00:48:15 +0000 (00:48 +0000)]
Merge "Show view mode button in action bar on Downloads."

8 years agoMerge "Fix null offscreen buffer crash"
Chris Craik [Wed, 3 Feb 2016 00:42:30 +0000 (00:42 +0000)]
Merge "Fix null offscreen buffer crash"

8 years agoMerge "Allow specifying stack when starting activity in AM command."
Filip Gruszczynski [Wed, 3 Feb 2016 00:27:59 +0000 (00:27 +0000)]
Merge "Allow specifying stack when starting activity in AM command."

8 years agoAllow specifying stack when starting activity in AM command.
Filip Gruszczynski [Tue, 2 Feb 2016 23:07:15 +0000 (15:07 -0800)]
Allow specifying stack when starting activity in AM command.

Change-Id: I42032bdebf16b6cd2c0c87fd9aa5c261bc9fe25d

8 years agoMerge "VectorDrawable native rendering - Step 4 of MANY"
Doris Liu [Wed, 3 Feb 2016 00:19:22 +0000 (00:19 +0000)]
Merge "VectorDrawable native rendering - Step 4 of MANY"

8 years agoMerge "Animate pinned stack resize when launching acivity with new bounds."
Filip Gruszczynski [Wed, 3 Feb 2016 00:16:05 +0000 (00:16 +0000)]
Merge "Animate pinned stack resize when launching acivity with new bounds."

8 years agoRename Gps to Gnss for measurement-related APIs
Lifu Tang [Mon, 1 Feb 2016 09:52:00 +0000 (01:52 -0800)]
Rename Gps to Gnss for measurement-related APIs

Bug: 26895757
Change-Id: I12d89dc251e356cf976a4bcd3589a8925a8ad745

8 years agoFix null offscreen buffer crash
Chris Craik [Wed, 3 Feb 2016 00:10:32 +0000 (16:10 -0800)]
Fix null offscreen buffer crash

bug:26571145

Change-Id: I6e885fd6135c0987360275cbf5b46475c24401d4