205750 Commits

Author SHA1 Message Date
Geoff Mendal
596e71a3d4 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 7c6d61e8eb  -s ours

* commit '7c6d61e8eb9bfb27a038f48d2719c87bd6022e79':
  Import translations. DO NOT MERGE
2015-10-21 17:58:36 +00:00
Geoff Mendal
7c6d61e8eb Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 17:52:10 +00:00
Geoff Mendal
ea6ea27ba6 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: a73a642bfe  -s ours

* commit 'a73a642bfedd0a2fe0854329081354869bf70039':
  Import translations. DO NOT MERGE
2015-10-21 17:07:21 +00:00
Geoff Mendal
1622b4459a Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 17:06:27 +00:00
Geoff Mendal
c6fe063ddf Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
am: 84ab40cab2

* commit '84ab40cab243ac76a83c3d15478699998ba68236':
  Import translations. DO NOT MERGE
2015-10-21 17:06:03 +00:00
Geoff Mendal
899d016e89 Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 17:05:16 +00:00
Geoff Mendal
96b250771e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours
am: 762ce0fc44  -s ours

* commit '762ce0fc448ebd41225ef0600fb5d258de434de7':
  Import translations. DO NOT MERGE
2015-10-21 17:04:43 +00:00
Geoff Mendal
b9315af10d Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
am: 84ab40cab2

* commit '84ab40cab243ac76a83c3d15478699998ba68236':
  Import translations. DO NOT MERGE
2015-10-21 17:04:18 +00:00
Geoff Mendal
fc7130c913 Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 17:04:07 +00:00
Geoff Mendal
38d9cb21b3 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 7f174ff665  -s ours

* commit '7f174ff6653154c4f1c3b184c402e92a4f53b7dd':
  Import translations. DO NOT MERGE
2015-10-21 17:03:40 +00:00
Geoff Mendal
a948cfe393 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours
am: 762ce0fc44  -s ours

* commit '762ce0fc448ebd41225ef0600fb5d258de434de7':
  Import translations. DO NOT MERGE
2015-10-21 17:02:59 +00:00
Geoff Mendal
9db863761e Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 17:02:06 +00:00
Geoff Mendal
7829bc5ad4 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 55bc169d50  -s ours

* commit '55bc169d5094ef1faf1cdca6c9952f29c7189d9d':
  Import translations. DO NOT MERGE
2015-10-21 17:01:41 +00:00
Geoff Mendal
f7e27a2dc1 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 7f174ff665  -s ours

* commit '7f174ff6653154c4f1c3b184c402e92a4f53b7dd':
  Import translations. DO NOT MERGE
2015-10-21 17:00:53 +00:00
Geoff Mendal
c49ecff854 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 55bc169d50  -s ours

* commit '55bc169d5094ef1faf1cdca6c9952f29c7189d9d':
  Import translations. DO NOT MERGE
2015-10-21 16:58:59 +00:00
Geoff Mendal
9aa4c094c1 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 721249f22b  -s ours

* commit '721249f22b11b45ff26045cc7c718334a12b7400':
  Import translations. DO NOT MERGE
2015-10-21 16:57:46 +00:00
Geoff Mendal
a400a1236c Import translations. DO NOT MERGE
Change-Id: If77b4f540cb80ac3d88c56d043069c4fd890b81a
Auto-generated-cl: translation import
2015-10-21 09:56:57 -07:00
Geoff Mendal
4c96a0331c Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 04733e23a3  -s ours

* commit '04733e23a316cfec96e195d05235e57b13439454':
  Import translations. DO NOT MERGE
2015-10-21 16:55:59 +00:00
Geoff Mendal
a9af8921f1 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: cd000a2228  -s ours

* commit 'cd000a22282cea343b9265ab63b4e316fca64925':
  Import translations. DO NOT MERGE
2015-10-21 16:54:33 +00:00
Geoff Mendal
bd0cfcf867 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: b8f70e10ef  -s ours

* commit 'b8f70e10efc2199f383611e3d82f2f1d721d53fc':
  Import translations. DO NOT MERGE
2015-10-21 16:53:03 +00:00
Geoff Mendal
a73a642bfe Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:51:34 +00:00
Geoff Mendal
b4dc6a35d3 Import translations. DO NOT MERGE
Change-Id: Ie451c3262cd6073b9cbf71ab8d0bc38ad212b0c4
Auto-generated-cl: translation import
2015-10-21 09:48:43 -07:00
Geoff Mendal
84ab40cab2 Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 2015-10-21 16:47:40 +00:00
Geoff Mendal
762ce0fc44 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: 8ba1cdd946  -s ours

* commit '8ba1cdd9464b88375755e1976e4ee0f5620ff5be':
  Import translations. DO NOT MERGE
2015-10-21 16:47:13 +00:00
Geoff Mendal
88f7134584 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:45:48 +00:00
Geoff Mendal
7e1d841d63 Import translations. DO NOT MERGE
Change-Id: Ib804ad4db26e8029d8c55ccda9046273baf93de3
Auto-generated-cl: translation import
2015-10-21 09:45:23 -07:00
Geoff Mendal
7f174ff665 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:44:33 +00:00
Geoff Mendal
55bc169d50 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:44:08 +00:00
Geoff Mendal
721249f22b Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:43:45 +00:00
Geoff Mendal
04733e23a3 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:43:21 +00:00
Geoff Mendal
cd000a2228 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:42:29 +00:00
Geoff Mendal
8caa78eccb Import translations. DO NOT MERGE
Change-Id: I9ee163f9a6b6bc4150c8661f3087385b5415dd0b
Auto-generated-cl: translation import
2015-10-21 09:42:17 -07:00
Geoff Mendal
b8f70e10ef Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:42:08 +00:00
Geoff Mendal
8ba1cdd946 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-21 16:39:56 +00:00
Geoff Mendal
5fafafc434 Import translations. DO NOT MERGE
Change-Id: I74489702454570e28841759451b47d7381dcf8c7
Auto-generated-cl: translation import
2015-10-21 09:39:05 -07:00
Geoff Mendal
1e7fb19408 Import translations. DO NOT MERGE
Change-Id: Ie94144993d7f959cf30eaeba12ef9a86a92bb48d
Auto-generated-cl: translation import
2015-10-21 11:37:21 -05:00
Geoff Mendal
91898cca7d Import translations. DO NOT MERGE
Change-Id: I2dfb95a393fe97360dc2fff6f849c727cb6a180b
Auto-generated-cl: translation import
2015-10-21 09:35:36 -07:00
Andrei Stingaceanu
509a74972a Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b
am: 24fc647e70

* commit '24fc647e70af950dbe671e9a709da8f97b2ba216':
  Fix toolbar flickering in ExtractedMode when longpressing.
2015-10-21 16:33:28 +00:00
Geoff Mendal
65855a104b Import translations. DO NOT MERGE
Change-Id: Iaef98e762ece5d69ed668ca83daecc0273197bf4
Auto-generated-cl: translation import
2015-10-21 09:32:22 -07:00
Geoff Mendal
efb0f8d77f Import translations. DO NOT MERGE
Change-Id: Id94c0578c377d92e038affd93bf25a07b22e9d7d
Auto-generated-cl: translation import
2015-10-21 09:29:09 -07:00
Geoff Mendal
990df68b2a Import translations. DO NOT MERGE
Change-Id: Iafe3e615aa33308b7fb6e2b71df40e190371b7f3
Auto-generated-cl: translation import
2015-10-21 11:24:14 -05:00
Andrei Stingaceanu
24fc647e70 Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev
am: ee4ab0a55b

* commit 'ee4ab0a55b355b21168de0eb5615f2e321c2982f':
  Fix toolbar flickering in ExtractedMode when longpressing.
2015-10-21 16:03:52 +00:00
Andrei Stingaceanu
ee4ab0a55b Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev 2015-10-21 15:56:26 +00:00
Paul Lawrence
2a75ecbe9d Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 15:04:17 +00:00
Paul Lawrence
146ef50d5b Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
am: 8deb694779

* commit '8deb6947795426a3379c7487ac3aeb6cdce5e58d':
2015-10-21 15:03:54 +00:00
Paul Lawrence
0b2f041122 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
am: 8deb694779

* commit '8deb6947795426a3379c7487ac3aeb6cdce5e58d':
2015-10-21 15:02:13 +00:00
Paul Lawrence
eab4352d9b Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce
am: 29c5fb2646

* commit '29c5fb2646dd0bc0f2fa8b3b98f0893d7d57469b':
  Don't include password on default encryption command
2015-10-21 15:00:58 +00:00
Geoff Mendal
03c5ec76d6 Import translations. DO NOT MERGE am: fde4111eea -s ours
am: c37fe84736  -s ours

* commit 'c37fe847361b91dcabe47673a9145b7f7b52fb51':
  Import translations. DO NOT MERGE
2015-10-21 14:59:34 +00:00
Paul Lawrence
8deb694779 Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 2015-10-21 14:53:48 +00:00
Paul Lawrence
29c5fb2646 Merge "Don\'t include password on default encryption command" into mnc-dr-dev
am: 68521fd7ce

* commit '68521fd7ce5e87a4e752569b5691b75d441e8a48':
  Don't include password on default encryption command
2015-10-21 14:53:23 +00:00