Commit Graph

212527 Commits

Author SHA1 Message Date
Geoff Mendal
3d6ca8017d Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 17:28:55 +00:00
Geoff Mendal
86f2721e96 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 84ab40cab2
am: c6fe063ddf

* commit 'c6fe063ddf113a5551f3bfe6a1f1631c775d9cc6':
  Import translations. DO NOT MERGE
2015-10-21 17:27:54 +00:00
Geoff Mendal
221e22d027 Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 17:26:58 +00:00
Geoff Mendal
129ae4421d Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: 899d016e89

* commit '899d016e89daeccd8f1f5b15a5222f801570f283':
2015-10-21 17:26:29 +00:00
Geoff Mendal
aca0e50f86 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 84ab40cab2
am: c6fe063ddf

* commit 'c6fe063ddf113a5551f3bfe6a1f1631c775d9cc6':
  Import translations. DO NOT MERGE
2015-10-21 17:26:14 +00:00
Geoff Mendal
947dada111 Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 17:25:38 +00:00
Geoff Mendal
86b9bcd907 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours am: 762ce0fc44 -s ours
am: 96b250771e  -s ours

* commit '96b250771e54513fd306961e5b0251a3cda13061':
  Import translations. DO NOT MERGE
2015-10-21 17:25:10 +00:00
Geoff Mendal
22e23d1dd4 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: 899d016e89

* commit '899d016e89daeccd8f1f5b15a5222f801570f283':
2015-10-21 17:25:03 +00:00
Geoff Mendal
545ce9c36a Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 17:24:41 +00:00
Geoff Mendal
ae2a8ef527 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: fc7130c913

* commit 'fc7130c91323dd76d4e167901207c1934e91ada1':
2015-10-21 17:24:15 +00:00
Geoff Mendal
9bf6d96370 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours am: 762ce0fc44 -s ours
am: 96b250771e  -s ours

* commit '96b250771e54513fd306961e5b0251a3cda13061':
  Import translations. DO NOT MERGE
2015-10-21 17:23:52 +00:00
Geoff Mendal
8d1802f9c2 Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 17:23:23 +00:00
Geoff Mendal
8a9896cb99 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 7f174ff665 -s ours
am: 38d9cb21b3  -s ours

* commit '38d9cb21b3714ac1a8a004319756ea2f44284fc0':
  Import translations. DO NOT MERGE
2015-10-21 17:22:57 +00:00
Geoff Mendal
a768d05f47 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: fc7130c913

* commit 'fc7130c91323dd76d4e167901207c1934e91ada1':
2015-10-21 17:22:33 +00:00
Geoff Mendal
b51009dad3 Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 17:22:02 +00:00
Geoff Mendal
55b64e1de6 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: 9db863761e

* commit '9db863761e42dd92dbb2be53eeac8e5a9b81c682':
2015-10-21 17:21:36 +00:00
Geoff Mendal
54d2bf811d Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 7f174ff665 -s ours
am: 38d9cb21b3  -s ours

* commit '38d9cb21b3714ac1a8a004319756ea2f44284fc0':
  Import translations. DO NOT MERGE
2015-10-21 17:21:08 +00:00
Geoff Mendal
fdc7acf182 Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 17:20:32 +00:00
Geoff Mendal
1ae2460a57 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 55bc169d50 -s ours
am: 7829bc5ad4  -s ours

* commit '7829bc5ad44cb68465b81733f66e19c413cfba86':
  Import translations. DO NOT MERGE
2015-10-21 17:19:57 +00:00
Geoff Mendal
850e4db320 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: 9db863761e

* commit '9db863761e42dd92dbb2be53eeac8e5a9b81c682':
2015-10-21 17:19:54 +00:00
Geoff Mendal
5912b73a58 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 55bc169d50 -s ours
am: 7829bc5ad4  -s ours

* commit '7829bc5ad44cb68465b81733f66e19c413cfba86':
  Import translations. DO NOT MERGE
2015-10-21 17:17:51 +00:00
Geoff Mendal
38d5ebd4eb Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 721249f22b -s ours
am: 9aa4c094c1  -s ours

* commit '9aa4c094c1b5271629d6736a8533e0a234ee2d9d':
  Import translations. DO NOT MERGE
2015-10-21 17:16:22 +00:00
Geoff Mendal
868e7bf0d3 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 04733e23a3 -s ours
am: 4c96a0331c  -s ours

* commit '4c96a0331cf744918fdd2c89af6c3cf5ec7c553a':
  Import translations. DO NOT MERGE
2015-10-21 17:14:07 +00:00
Geoff Mendal
adc2faa46f Merge "Import translations. DO NOT MERGE" into cw-e-dev am: cd000a2228 -s ours
am: a9af8921f1  -s ours

* commit 'a9af8921f124c876be4d29cfa190782d5a642923':
  Import translations. DO NOT MERGE
2015-10-21 17:12:35 +00:00
Geoff Mendal
61b81ab942 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: b8f70e10ef -s ours
am: bd0cfcf867  -s ours

* commit 'bd0cfcf8675ae1fc4d960aadced501cd59f04107':
  Import translations. DO NOT MERGE
2015-10-21 17:11:14 +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
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
Andrei Stingaceanu
da113efda2 Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 16:56:12 +00: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
Andrei Stingaceanu
fe622345b0 Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b am: 24fc647e70
am: 509a74972a

* commit '509a74972af13c845a67ad9edddd8e413cc7884a':
  Fix toolbar flickering in ExtractedMode when longpressing.
2015-10-21 16:55:37 +00:00
Andrei Stingaceanu
0b7d715e2c Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 16:55:11 +00:00
Andrei Stingaceanu
ee417ca5c3 Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b am: 24fc647e70
am: 509a74972a

* commit '509a74972af13c845a67ad9edddd8e413cc7884a':
  Fix toolbar flickering in ExtractedMode when longpressing.
2015-10-21 16:54:43 +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
Paul Lawrence
175cef67ec Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-10-21 16:53:53 +00:00
Paul Lawrence
30866628b8 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: 2a75ecbe9d

* commit '2a75ecbe9d09eee73a0e11511a8e49e14542ca28':
2015-10-21 16:53:22 +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
Paul Lawrence
e1d95ccf5c Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: 2a75ecbe9d

* commit '2a75ecbe9d09eee73a0e11511a8e49e14542ca28':
2015-10-21 16:51:56 +00:00
Paul Lawrence
dc4c11ff9f Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 8deb694779
am: 146ef50d5b

* commit '146ef50d5baa8ce427c13cfbbcdfb59a50c91a9f':
2015-10-21 16:50:40 +00:00
Paul Lawrence
74a3281e9c Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce am: 29c5fb2646
am: eab4352d9b

* commit 'eab4352d9bd945c7fa375c6f28972900f0b99671':
  Don't include password on default encryption command
2015-10-21 16:49:24 +00:00
Geoff Mendal
e4936c9fed Import translations. DO NOT MERGE am: fde4111eea -s ours am: c37fe84736 -s ours
am: 03c5ec76d6  -s ours

* commit '03c5ec76d6c90ac4e840e852c1ef6fc41c4ad67a':
  Import translations. DO NOT MERGE
2015-10-21 16:47:55 +00: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