Geoff Mendal
|
dd78df5884
|
Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 7c6d61e8eb -s ours am: 596e71a3d4 -s ours
am: ee9e812984 -s ours
* commit 'ee9e81298494b4246ef9c77848d2594f8a34d646':
Import translations. DO NOT MERGE
|
2015-10-21 18:25:06 +00:00 |
|
Tao Bao
|
2c3b24ea5d
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2015-10-21 18:22:42 +00:00 |
|
Tao Bao
|
48d7b31b4b
|
Merge "Clean up the uncrypted OTA package on bootup." am: 5d562d4d2f am: ac140e7f76
am: db33bfc2a9
* commit 'db33bfc2a96c38eba5b67c82cb4fee69c52b80ad':
Clean up the uncrypted OTA package on bootup.
|
2015-10-21 18:22:13 +00:00 |
|
Geoff Mendal
|
3f0aaa9f7e
|
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: a2c9a412f4
* commit 'a2c9a412f463da91bc3ae35c5ea60d8ba920a104':
|
2015-10-21 18:20:47 +00:00 |
|
Geoff Mendal
|
584cae9a3b
|
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: a2c9a412f4
* commit 'a2c9a412f463da91bc3ae35c5ea60d8ba920a104':
|
2015-10-21 18:17:39 +00:00 |
|
Geoff Mendal
|
0192d592dc
|
Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a73a642bfe -s ours am: ea6ea27ba6 -s ours
am: 7dd2ea1f4e -s ours
* commit '7dd2ea1f4ee9f2df25b3705ff5273076a948b6a1':
Import translations. DO NOT MERGE
|
2015-10-21 18:16:22 +00:00 |
|
Geoff Mendal
|
2fbefc0636
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2015-10-21 18:15:27 +00:00 |
|
Geoff Mendal
|
7f9e943764
|
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: f4bce5229e
* commit 'f4bce5229e0ee9b2ba8d131d8d4c931384a56bd1':
|
2015-10-21 18:15:01 +00:00 |
|
Geoff Mendal
|
ee9e812984
|
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
|
2015-10-21 18:13:20 +00:00 |
|
Geoff Mendal
|
22868613bf
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2015-10-21 18:11:59 +00:00 |
|
Geoff Mendal
|
963b4821d2
|
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: f4bce5229e
* commit 'f4bce5229e0ee9b2ba8d131d8d4c931384a56bd1':
|
2015-10-21 18:11:15 +00:00 |
|
Geoff Mendal
|
58e92750ca
|
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 1622b4459a
am: 666af89eac
* commit '666af89eac3447a367f6df4f4fddd34942902331':
|
2015-10-21 18:09:39 +00:00 |
|
Geoff Mendal
|
a1098c7b68
|
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 1622b4459a
am: 666af89eac
* commit '666af89eac3447a367f6df4f4fddd34942902331':
|
2015-10-21 18:07:22 +00:00 |
|
Geoff Mendal
|
516009d01a
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2015-10-21 18:06:01 +00:00 |
|
Geoff Mendal
|
fc1dd5007e
|
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: 3d6ca8017d
* commit '3d6ca8017d5fb55b5dabc290723467dd469bfabe':
|
2015-10-21 18:05:51 +00:00 |
|
Tao Bao
|
db33bfc2a9
|
Merge "Clean up the uncrypted OTA package on bootup." am: 5d562d4d2f
am: ac140e7f76
* commit 'ac140e7f7690979378897546e7934381f62922ab':
Clean up the uncrypted OTA package on bootup.
|
2015-10-21 18:05:18 +00:00 |
|
Geoff Mendal
|
ca2f429744
|
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: 3d6ca8017d
* commit '3d6ca8017d5fb55b5dabc290723467dd469bfabe':
|
2015-10-21 18:04:19 +00:00 |
|
Geoff Mendal
|
d19391cc28
|
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
am: 86f2721e96
* commit '86f2721e961863adfb58604c41bb70a232112e2c':
Import translations. DO NOT MERGE
|
2015-10-21 18:03:46 +00:00 |
|
Geoff Mendal
|
db6e9fb776
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2015-10-21 18:01:08 +00:00 |
|
Geoff Mendal
|
ef40d8360c
|
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: 221e22d027
* commit '221e22d0277a848504df0169dc40ec1a2fe244df':
|
2015-10-21 18:00:23 +00:00 |
|
Geoff Mendal
|
f5f7cb4449
|
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
am: 86f2721e96
* commit '86f2721e961863adfb58604c41bb70a232112e2c':
Import translations. DO NOT MERGE
|
2015-10-21 18:00:23 +00:00 |
|
Geoff Mendal
|
51132a98dd
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2015-10-21 17:58:50 +00:00 |
|
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
|
da4b9fc235
|
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: 221e22d027
* commit '221e22d0277a848504df0169dc40ec1a2fe244df':
|
2015-10-21 17:58:15 +00:00 |
|
Geoff Mendal
|
517e67f9b0
|
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: 129ae4421d
* commit '129ae4421df203b4f5cb5b1bd572cffdecfb32da':
|
2015-10-21 17:58:09 +00:00 |
|
Geoff Mendal
|
fd9f72520f
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2015-10-21 17:55:15 +00:00 |
|
Geoff Mendal
|
c8dae39a77
|
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:54:50 +00:00 |
|
Geoff Mendal
|
9cdee95225
|
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: 129ae4421d
* commit '129ae4421df203b4f5cb5b1bd572cffdecfb32da':
|
2015-10-21 17:54:22 +00:00 |
|
Geoff Mendal
|
56bf3090fe
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2015-10-21 17:53:37 +00:00 |
|
Geoff Mendal
|
7fef2a2174
|
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:53:10 +00:00 |
|
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
|
c7072b65c0
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2015-10-21 17:52:14 +00:00 |
|
Geoff Mendal
|
7c6d61e8eb
|
Merge "Import translations. DO NOT MERGE" into cw-e-dev
|
2015-10-21 17:52:10 +00:00 |
|
Tao Bao
|
ac140e7f76
|
Merge "Clean up the uncrypted OTA package on bootup."
am: 5d562d4d2f
* commit '5d562d4d2fe5697468e5b93b183ed8ea42e115a2':
Clean up the uncrypted OTA package on bootup.
|
2015-10-21 17:51:53 +00:00 |
|
Geoff Mendal
|
0f2969dbb5
|
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:51:45 +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 |
|