OSDN Git Service
Geoff Mendal [Wed, 21 Oct 2015 18:17:22 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
9e30c4b406 -s ours
am:
93e157a883 -s ours
* commit '
93e157a883e3c8ab5f4ff434cb33a6c71ad01a94':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:16:04 +0000 (18:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
6e66ac8e66 -s ours
am:
71829e47ae -s ours
* commit '
71829e47aec78ef2a3cc99649c99b7f08af590d9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:13:20 +0000 (18:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
7c6d61e8eb -s ours
am:
596e71a3d4 -s ours
* commit '
596e71a3d45b4a968cc8205953ccf5454b6a42d3':
Import translations. DO NOT MERGE
Tao Bao [Wed, 21 Oct 2015 18:05:18 +0000 (18:05 +0000)]
Merge "Clean up the uncrypted OTA package on bootup." am:
5d562d4d2f
am:
ac140e7f76
* commit '
ac140e7f7690979378897546e7934381f62922ab':
Clean up the uncrypted OTA package on bootup.
Geoff Mendal [Wed, 21 Oct 2015 18:01:40 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
9e30c4b406 -s ours
* commit '
9e30c4b4062296bd1eb918d20b6f28032644d820':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:00:18 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
6e66ac8e66 -s ours
* commit '
6e66ac8e6624d818ce8675ecc74b05452103bb22':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:58:36 +0000 (17:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
7c6d61e8eb -s ours
* commit '
7c6d61e8eb9bfb27a038f48d2719c87bd6022e79':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:56:23 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 17:55:04 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 17:52:10 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Tao Bao [Wed, 21 Oct 2015 17:51:53 +0000 (17:51 +0000)]
Merge "Clean up the uncrypted OTA package on bootup."
am:
5d562d4d2f
* commit '
5d562d4d2fe5697468e5b93b183ed8ea42e115a2':
Clean up the uncrypted OTA package on bootup.
Geoff Mendal [Wed, 21 Oct 2015 17:30:49 +0000 (17:30 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:30:24 +0000 (17:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
a73a642bfe -s ours
am:
ea6ea27ba6 -s ours
* commit '
ea6ea27ba6ee2f89ab768a23ca036d5cc383c47f':
Import translations. DO NOT MERGE
Tao Bao [Wed, 21 Oct 2015 17:30:04 +0000 (17:30 +0000)]
Merge "Clean up the uncrypted OTA package on bootup."
Geoff Mendal [Wed, 21 Oct 2015 17:29:54 +0000 (17:29 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:29:26 +0000 (17:29 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am:
1622b4459a
* commit '
1622b4459aea71f71d4c34087c61f0fdc40dbab1':
Geoff Mendal [Wed, 21 Oct 2015 17:28:56 +0000 (17:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
a73a642bfe -s ours
am:
ea6ea27ba6 -s ours
* commit '
ea6ea27ba6ee2f89ab768a23ca036d5cc383c47f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:28:55 +0000 (17:28 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:27:54 +0000 (17:27 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:27:30 +0000 (17:27 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am:
1622b4459a
* commit '
1622b4459aea71f71d4c34087c61f0fdc40dbab1':
Geoff Mendal [Wed, 21 Oct 2015 17:26:58 +0000 (17:26 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:26:29 +0000 (17:26 +0000)]
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':
Geoff Mendal [Wed, 21 Oct 2015 17:26:14 +0000 (17:26 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:25:38 +0000 (17:25 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:25:10 +0000 (17:25 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:25:03 +0000 (17:25 +0000)]
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':
Geoff Mendal [Wed, 21 Oct 2015 17:24:41 +0000 (17:24 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:24:15 +0000 (17:24 +0000)]
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':
Geoff Mendal [Wed, 21 Oct 2015 17:23:52 +0000 (17:23 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:23:23 +0000 (17:23 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:22:57 +0000 (17:22 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:22:33 +0000 (17:22 +0000)]
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':
Geoff Mendal [Wed, 21 Oct 2015 17:22:02 +0000 (17:22 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:21:36 +0000 (17:21 +0000)]
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':
Geoff Mendal [Wed, 21 Oct 2015 17:21:08 +0000 (17:21 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:20:32 +0000 (17:20 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:19:57 +0000 (17:19 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:19:54 +0000 (17:19 +0000)]
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':
Geoff Mendal [Wed, 21 Oct 2015 17:17:51 +0000 (17:17 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:16:22 +0000 (17:16 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:14:07 +0000 (17:14 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:12:35 +0000 (17:12 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:11:14 +0000 (17:11 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:07:21 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
a73a642bfe -s ours
* commit '
a73a642bfedd0a2fe0854329081354869bf70039':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:06:27 +0000 (17:06 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
Geoff Mendal [Wed, 21 Oct 2015 17:06:03 +0000 (17:06 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:05:16 +0000 (17:05 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
Geoff Mendal [Wed, 21 Oct 2015 17:04:43 +0000 (17:04 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:04:18 +0000 (17:04 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:04:07 +0000 (17:04 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
Geoff Mendal [Wed, 21 Oct 2015 17:03:57 +0000 (10:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4b7d4378ff46c26fa5da8449fca10274beef157
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 17:03:40 +0000 (17:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
7f174ff665 -s ours
* commit '
7f174ff6653154c4f1c3b184c402e92a4f53b7dd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:02:59 +0000 (17:02 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 17:02:06 +0000 (17:02 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
Geoff Mendal [Wed, 21 Oct 2015 17:01:41 +0000 (17:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
55bc169d50 -s ours
* commit '
55bc169d5094ef1faf1cdca6c9952f29c7189d9d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:00:53 +0000 (17:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
7f174ff665 -s ours
* commit '
7f174ff6653154c4f1c3b184c402e92a4f53b7dd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:00:28 +0000 (10:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6766fce7213a69ce3e08ce5de869714b89e62adf
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:58:59 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
55bc169d50 -s ours
* commit '
55bc169d5094ef1faf1cdca6c9952f29c7189d9d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 16:57:46 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
721249f22b -s ours
* commit '
721249f22b11b45ff26045cc7c718334a12b7400':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 16:56:57 +0000 (09:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: If77b4f540cb80ac3d88c56d043069c4fd890b81a
Auto-generated-cl: translation import
Andrei Stingaceanu [Wed, 21 Oct 2015 16:56:12 +0000 (16:56 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 16:55:59 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
04733e23a3 -s ours
* commit '
04733e23a316cfec96e195d05235e57b13439454':
Import translations. DO NOT MERGE
Andrei Stingaceanu [Wed, 21 Oct 2015 16:55:37 +0000 (16:55 +0000)]
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.
Andrei Stingaceanu [Wed, 21 Oct 2015 16:55:11 +0000 (16:55 +0000)]
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
Andrei Stingaceanu [Wed, 21 Oct 2015 16:54:43 +0000 (16:54 +0000)]
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.
Geoff Mendal [Wed, 21 Oct 2015 16:54:33 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
cd000a2228 -s ours
* commit '
cd000a22282cea343b9265ab63b4e316fca64925':
Import translations. DO NOT MERGE
Paul Lawrence [Wed, 21 Oct 2015 16:53:53 +0000 (16:53 +0000)]
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
Paul Lawrence [Wed, 21 Oct 2015 16:53:22 +0000 (16:53 +0000)]
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':
Geoff Mendal [Wed, 21 Oct 2015 16:53:03 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
b8f70e10ef -s ours
* commit '
b8f70e10efc2199f383611e3d82f2f1d721d53fc':
Import translations. DO NOT MERGE
Paul Lawrence [Wed, 21 Oct 2015 16:51:56 +0000 (16:51 +0000)]
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':
Geoff Mendal [Wed, 21 Oct 2015 16:51:34 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Paul Lawrence [Wed, 21 Oct 2015 16:50:40 +0000 (16:50 +0000)]
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':
Paul Lawrence [Wed, 21 Oct 2015 16:49:24 +0000 (16:49 +0000)]
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
Geoff Mendal [Wed, 21 Oct 2015 16:48:43 +0000 (09:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie451c3262cd6073b9cbf71ab8d0bc38ad212b0c4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:47:55 +0000 (16:47 +0000)]
Import translations. DO NOT MERGE am:
fde4111eea -s ours am:
c37fe84736 -s ours
am:
03c5ec76d6 -s ours
* commit '
03c5ec76d6c90ac4e840e852c1ef6fc41c4ad67a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 16:47:40 +0000 (16:47 +0000)]
Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:47:13 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
8ba1cdd946 -s ours
* commit '
8ba1cdd9464b88375755e1976e4ee0f5620ff5be':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 16:45:48 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:45:23 +0000 (09:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib804ad4db26e8029d8c55ccda9046273baf93de3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:44:33 +0000 (16:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:44:08 +0000 (16:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:43:45 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:43:21 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:42:29 +0000 (16:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:42:17 +0000 (09:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ee163f9a6b6bc4150c8661f3087385b5415dd0b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:42:08 +0000 (16:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:39:56 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 21 Oct 2015 16:39:05 +0000 (09:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I74489702454570e28841759451b47d7381dcf8c7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:37:21 +0000 (11:37 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ie94144993d7f959cf30eaeba12ef9a86a92bb48d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:35:36 +0000 (09:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2dfb95a393fe97360dc2fff6f849c727cb6a180b
Auto-generated-cl: translation import
Andrei Stingaceanu [Wed, 21 Oct 2015 16:33:28 +0000 (16:33 +0000)]
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.
Wale Ogunwale [Wed, 21 Oct 2015 16:33:25 +0000 (16:33 +0000)]
Merge "Ensure state transition of paused activity." am:
c2b9c5388a
am:
11695e8081
* commit '
11695e8081b269d489b5b4cc0b0c2075baeebc9b':
Ensure state transition of paused activity.
Geoff Mendal [Wed, 21 Oct 2015 16:32:22 +0000 (09:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaef98e762ece5d69ed668ca83daecc0273197bf4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:29:09 +0000 (09:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id94c0578c377d92e038affd93bf25a07b22e9d7d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:24:14 +0000 (11:24 -0500)]
Import translations. DO NOT MERGE
Change-Id: Iafe3e615aa33308b7fb6e2b71df40e190371b7f3
Auto-generated-cl: translation import
Wale Ogunwale [Wed, 21 Oct 2015 16:08:51 +0000 (16:08 +0000)]
Merge "Ensure state transition of paused activity."
am:
c2b9c5388a
* commit '
c2b9c5388a4038ba260e2c36b7b8884cf4097c2e':
Ensure state transition of paused activity.
Andrei Stingaceanu [Wed, 21 Oct 2015 16:03:52 +0000 (16:03 +0000)]
Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev
am:
ee4ab0a55b
* commit '
ee4ab0a55b355b21168de0eb5615f2e321c2982f':
Fix toolbar flickering in ExtractedMode when longpressing.
Wale Ogunwale [Wed, 21 Oct 2015 16:03:23 +0000 (16:03 +0000)]
Merge "Ensure state transition of paused activity."
Andrei Stingaceanu [Wed, 21 Oct 2015 15:56:26 +0000 (15:56 +0000)]
Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev
Paul Lawrence [Wed, 21 Oct 2015 15:04:17 +0000 (15:04 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
OSDN Git Service
