Jeff Brown
dc8d2e319c
am 51fb09d9: am cebd1e94: am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
2010-04-08 16:54:37 -07:00
Brett Chabot
457b247072
am 19912d2f: am 3622d253: am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo
2010-04-08 16:54:32 -07:00
Jeff Brown
aa27eba6e2
am cebd1e94: am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
2010-04-08 16:49:52 -07:00
Brett Chabot
42436caa39
am 3622d253: am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo
2010-04-08 16:49:46 -07:00
Jeff Brown
38f5d6454d
am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
...
Merge commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0' into kraken
* commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0':
Improve robustness of package manager certificate collection.
2010-04-08 16:47:15 -07:00
Brett Chabot
c99332653f
am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo
...
Merge commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97' into kraken
* commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97':
IME test fixes.
2010-04-08 16:45:16 -07:00
Jeff Brown
68e2f85740
am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
...
Merge commit '779a4ca84d62a6e4f18a723cfc18c5d035f60fed' into froyo-plus-aosp
* commit '779a4ca84d62a6e4f18a723cfc18c5d035f60fed':
Improve robustness of package manager certificate collection.
2010-04-08 16:44:37 -07:00
Jeff Brown
20460cfc7d
Merge "Improve robustness of package manager certificate collection." into froyo
2010-04-08 16:41:37 -07:00
Brett Chabot
5313fd997b
am 185f1a96: Merge "IME test fixes." into froyo
...
Merge commit '185f1a96683f59e2ff617b688449fd490e364be7' into froyo-plus-aosp
* commit '185f1a96683f59e2ff617b688449fd490e364be7':
IME test fixes.
2010-04-08 16:39:50 -07:00
Brett Chabot
399d2f06da
Merge "IME test fixes." into froyo
2010-04-08 16:36:02 -07:00
Robert Greenwalt
86f9e11a58
am b2216375: am da0498c5: am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
2010-04-08 16:30:55 -07:00
Robert Greenwalt
4795d40777
am da0498c5: am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
2010-04-08 16:28:08 -07:00
Robert Greenwalt
89aea51145
am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
...
Merge commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75' into kraken
* commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75':
Updating some notificiation UI for Throttling
2010-04-08 16:25:54 -07:00
Robert Greenwalt
8a3b2cf4c8
am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
...
Merge commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7' into froyo-plus-aosp
* commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7':
Updating some notificiation UI for Throttling
2010-04-08 16:18:31 -07:00
Robert Greenwalt
8e1b0077ad
Merge "Updating some notificiation UI for Throttling" into froyo
2010-04-08 16:09:31 -07:00
Dan Egnor
305da2ed58
am 9a907e75: am a40b3a8d: am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
2010-04-08 14:59:49 -07:00
Dan Egnor
9f64437615
am a40b3a8d: am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
2010-04-08 14:57:02 -07:00
Dan Egnor
00e55cbf87
am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
...
Merge commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b' into kraken
* commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b':
Change TrafficStats to a new JNI implementation.
2010-04-08 14:53:06 -07:00
Dan Egnor
02b338b7f2
am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
...
Merge commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b' into froyo-plus-aosp
* commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b':
Change TrafficStats to a new JNI implementation.
2010-04-08 14:48:50 -07:00
Dan Egnor
efdccf3ebb
Merge "Change TrafficStats to a new JNI implementation." into froyo
2010-04-08 14:45:07 -07:00
Dan Egnor
4a360c3ff6
am c138fd3a: am a28a05f3: am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:28:29 -07:00
Dan Egnor
22a2329d02
am a28a05f3: am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:24:15 -07:00
Dan Egnor
1dbebb2627
am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
...
Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken
* commit 'f1f00f5bddd6b222879166f4528055a30bed307e':
Missed these ones in the previous rename.
2010-04-08 14:19:52 -07:00
Grace Kloba
42005b7803
am f1055bd5: am edcac52a: am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during
2010-04-08 14:19:38 -07:00
Grace Kloba
b9a17d49fa
am edcac52a: am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling,
2010-04-08 14:17:15 -07:00
Dan Egnor
7f22a7ccd1
am 21248080: Merge "Missed these ones in the previous rename." into froyo
...
Merge commit '2124808060a1eb5ea396238b7b99d2ed266b0b53' into froyo-plus-aosp
* commit '2124808060a1eb5ea396238b7b99d2ed266b0b53':
Missed these ones in the previous rename.
2010-04-08 14:15:29 -07:00
Brad Fitzpatrick
6123758361
am 341d0a52: am 9c3554e9: am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
2010-04-08 14:14:46 -07:00
Scott Main
4ff71b32f0
Merge "docs: rewrite resources documentation"
2010-04-08 14:13:10 -07:00
Grace Kloba
187a98c25e
am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate ca
...
Merge commit '642d1556f13ac13f07515309288214e532029c50' into kraken
* commit '642d1556f13ac13f07515309288214e532029c50':
For performance reason, we choose to block the picture
2010-04-08 14:12:58 -07:00
Brad Fitzpatrick
4c060a7e09
am 9c3554e9: am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
2010-04-08 14:12:20 -07:00
Dan Egnor
2728e5f544
Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:10:50 -07:00
Brad Fitzpatrick
e15bd8ec0c
am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
...
Merge commit '4183b514bb72d96e8ed925c14266a23067c02fe5' into kraken
* commit '4183b514bb72d96e8ed925c14266a23067c02fe5':
Rename logtag for clarity.
2010-04-08 14:08:56 -07:00
Grace Kloba
f11f1e8c89
am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate can drop by 30%.
...
Merge commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6' into froyo-plus-aosp
* commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6':
For performance reason, we choose to block the picture
2010-04-08 14:08:35 -07:00
Grace Kloba
b2a21d6ac3
Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don't block the live update during drag/fling, frame rate can drop by 30%." into froyo
2010-04-08 14:05:05 -07:00
Brad Fitzpatrick
ab7954a0b0
am c62cdef4: Merge "Rename logtag for clarity." into froyo
...
Merge commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72' into froyo-plus-aosp
* commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72':
Rename logtag for clarity.
2010-04-08 14:04:43 -07:00
Brad Fitzpatrick
b56b5fd4fc
Merge "Rename logtag for clarity." into froyo
2010-04-08 14:01:23 -07:00
Jeff Brown
7d31f9aa5f
am 281a687c: am a07fd3c5: am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:58:54 -07:00
Andreas Huber
6fe2e0b3d7
am 3bf36221: am 3eade67b: am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
2010-04-08 13:56:19 -07:00
Robert Greenwalt
339b90e023
resolved conflicts for merge of 4e33e9c1 to master
...
Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b
2010-04-08 13:54:58 -07:00
Jeff Brown
f00c611c90
am a07fd3c5: am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:54:12 -07:00
Jeff Brown
23605c9bea
am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
...
Merge commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b' into kraken
* commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b':
@hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:51:48 -07:00
Jeff Brown
bd2c3a73d0
am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
...
Merge commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f' into froyo-plus-aosp
* commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f':
@hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:49:55 -07:00
Andreas Huber
3d46683ef2
am 3eade67b: am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
2010-04-08 12:53:23 -07:00
Robert Greenwalt
71329eee0a
am 6646cf7a: am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
2010-04-08 12:53:18 -07:00
Andreas Huber
a7171fb1d7
am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
...
Merge commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c' into kraken
* commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c':
Refactor connection/redirection code, support redirects on reconnection.
2010-04-08 12:49:41 -07:00
Robert Greenwalt
f4b6a4e7f3
am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
...
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken
* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
Add service to monitor/control the flow of data.
2010-04-08 12:49:38 -07:00
Andreas Huber
376f0c3ee6
am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
...
Merge commit 'eb12e45f7a92fd424988451256c82605d086245d' into froyo-plus-aosp
* commit 'eb12e45f7a92fd424988451256c82605d086245d':
Refactor connection/redirection code, support redirects on reconnection.
2010-04-08 12:45:59 -07:00
Robert Greenwalt
53b96a3c8e
am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
...
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp
* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
Add service to monitor/control the flow of data.
2010-04-08 12:45:51 -07:00
Andreas Huber
d85bfb3a14
Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
2010-04-08 12:44:33 -07:00
Robert Greenwalt
98b863760c
Merge "Add service to monitor/control the flow of data." into froyo
2010-04-08 12:42:09 -07:00