drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
220,097 Commits 1 Branch 0 Tags
Commit Graph

220097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
57091274b0 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 
am: 947dada111

* commit '947dada111e47304b5a1bb9592490f2b42138ada':
 2015-10-21 17:52:58 +00:00
Geoff Mendal
72bffa80e3 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours am: 762ce0fc44 -s ours am: 96b250771e -s ours 
am: 86b9bcd907  -s ours

* commit '86b9bcd90771947bb0f46aecbe6849d5e22821c9':
 2015-10-21 17:51:33 +00:00
Geoff Mendal
8a44ca4c10 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 
am: 545ce9c36a

* commit '545ce9c36a59f263b6fef224f6df73c5655ddfd9':
 2015-10-21 17:50:03 +00:00
Geoff Mendal
dcfaf7308e Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: fc7130c913 
am: ae2a8ef527

* commit 'ae2a8ef527e79349f1ebd99780c50bb5b9107db8':
 2015-10-21 17:48:44 +00:00
Geoff Mendal
ae1f8b3c44 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 
am: 8d1802f9c2

* commit '8d1802f9c27cd17e5e9469ca0b02d251cd537f53':
 2015-10-21 17:47:25 +00:00
Geoff Mendal
481d8dad55 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 7f174ff665 -s ours am: 38d9cb21b3 -s ours 
am: 8a9896cb99  -s ours

* commit '8a9896cb99304d4ed20254a776e929da2a928d50':
 2015-10-21 17:46:03 +00:00
Geoff Mendal
cdb93b5df8 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 
am: b51009dad3

* commit 'b51009dad3f4ffe06b3777073d37d344d2345090':
 2015-10-21 17:44:45 +00:00
Geoff Mendal
56749759f6 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 9db863761e 
am: 55b64e1de6

* commit '55b64e1de62a1f1cb26e9d6a8ded162d112c59b9':
 2015-10-21 17:43:30 +00:00
Geoff Mendal
f93050086e 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 
am: fdc7acf182

* commit 'fdc7acf182b1664351c7d5c37273386a2abc5f92':
 2015-10-21 17:42:14 +00:00
Geoff Mendal
e1656b753b Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 17:41:14 +00:00
Geoff Mendal
08c49315eb Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 55bc169d50 -s ours am: 7829bc5ad4 -s ours 
am: 1ae2460a57  -s ours

* commit '1ae2460a578d7850874d602d89ef55ab0f6a3073':
 2015-10-21 17:40:46 +00:00
Geoff Mendal
ce1c806c87 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 899d016e89 
am: 22e23d1dd4

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

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

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

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

* commit '850e4db32091fae821d505c4fa29bfa238a78e6a':
 2015-10-21 17:35:02 +00:00
Geoff Mendal
da55e7178b Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 55bc169d50 -s ours am: 7829bc5ad4 -s ours 
am: 5912b73a58  -s ours

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

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

* commit '868e7bf0d382849041c4e4796f0ad978a5da8177':
  Import translations. DO NOT MERGE
 2015-10-21 17:31:12 +00:00
Geoff Mendal
a246ed2fed Merge "Import translations. DO NOT MERGE" into cw-e-dev am: cd000a2228 -s ours am: a9af8921f1 -s ours 
am: adc2faa46f  -s ours

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

* commit '61b81ab942b08eeebb4f6c67f345bf43d5bef51e':
  Import translations. DO NOT MERGE
 2015-10-21 17:27:50 +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
Andrei Stingaceanu
fcf2738b3c Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 17:13:24 +00:00
Andrei Stingaceanu
61c6219317 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 
am: da113efda2

* commit 'da113efda21ae5f23713db585262e796c5e2dd3b':
 2015-10-21 17:12:53 +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
Andrei Stingaceanu
09e41b9dd3 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 17:12:21 +00:00
Andrei Stingaceanu
fa7834379f Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b am: 24fc647e70 am: 509a74972a 
am: fe622345b0

* commit 'fe622345b02656b9e049dde9936987f38984e97d':
  Fix toolbar flickering in ExtractedMode when longpressing.
 2015-10-21 17:11:52 +00:00
Andrei Stingaceanu
f1755d5875 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 
am: da113efda2

* commit 'da113efda21ae5f23713db585262e796c5e2dd3b':
 2015-10-21 17:11:16 +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
Andrei Stingaceanu
dd3d9d88b4 Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b am: 24fc647e70 am: 509a74972a 
am: fe622345b0

* commit 'fe622345b02656b9e049dde9936987f38984e97d':
  Fix toolbar flickering in ExtractedMode when longpressing.
 2015-10-21 17:09:33 +00:00
Paul Lawrence
ae79b87393 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 
am: 175cef67ec

* commit '175cef67ec887b5f4d33a7494459c80b9a0e0895':
 2015-10-21 17:07:53 +00:00
Paul Lawrence
80f8a2d1ce Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 2a75ecbe9d 
am: 30866628b8

* commit '30866628b82b93824c08219eb4a43af26a0291df':
 2015-10-21 17:06:35 +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