Craig Mautner
|
893eacc591
|
am 4186f85d: am 28e000ef: Merge "Remove debugging for b6829431." into jb-mr1-dev
* commit '4186f85ddecc9d95aa130eb10bedbd2ef457c5b0':
Remove debugging for b6829431.
|
2012-08-01 10:29:01 -07:00 |
|
Craig Mautner
|
4186f85dde
|
am 28e000ef: Merge "Remove debugging for b6829431." into jb-mr1-dev
* commit '28e000ef72e9f86dec9d7be82dfac6d8c05882f7':
Remove debugging for b6829431.
|
2012-08-01 10:21:28 -07:00 |
|
Craig Mautner
|
28e000ef72
|
Merge "Remove debugging for b6829431." into jb-mr1-dev
|
2012-08-01 10:04:38 -07:00 |
|
Craig Mautner
|
1c43719c47
|
Remove debugging for b6829431.
Change-Id: If7da858722d5d0a5e7db2bc249d454bdee1ec94e
|
2012-08-01 10:01:16 -07:00 |
|
Peter Ng
|
0351b54e90
|
am c72a4957: am 5a912ac8: am 31737eaa: am a8666422: Merge "moving accessibility image to callouts" into jb-dev
* commit 'c72a495704235cbe130adfa1112297ce2ac2e009':
moving accessibility image to callouts
|
2012-08-01 09:07:34 -07:00 |
|
Peter Ng
|
ddda53ebc8
|
am 2c2291a0: am 5e07b6bd: am edd7873c: am c2eb7080: Merge "new extras section linking to design talks" into jb-dev
* commit '2c2291a046b4513410c7a6862e8676ff4f973c2a':
new extras section linking to design talks
|
2012-08-01 09:07:28 -07:00 |
|
Peter Ng
|
c72a495704
|
am 5a912ac8: am 31737eaa: am a8666422: Merge "moving accessibility image to callouts" into jb-dev
* commit '5a912ac8b9a7c289519572234a33129c584716a0':
moving accessibility image to callouts
|
2012-08-01 09:03:29 -07:00 |
|
Peter Ng
|
2c2291a046
|
am 5e07b6bd: am edd7873c: am c2eb7080: Merge "new extras section linking to design talks" into jb-dev
* commit '5e07b6bd2658fb993c32bdbb4a97384fe021a7a3':
new extras section linking to design talks
|
2012-08-01 09:03:20 -07:00 |
|
Peter Ng
|
5a912ac8b9
|
am 31737eaa: am a8666422: Merge "moving accessibility image to callouts" into jb-dev
* commit '31737eaa39bd0ef21a3cdc5470bbf124c70a6948':
moving accessibility image to callouts
|
2012-08-01 08:59:37 -07:00 |
|
Peter Ng
|
5e07b6bd26
|
am edd7873c: am c2eb7080: Merge "new extras section linking to design talks" into jb-dev
* commit 'edd7873c3475b871b6496e854e369c8f15c7e9a1':
new extras section linking to design talks
|
2012-08-01 08:59:33 -07:00 |
|
Peter Ng
|
31737eaa39
|
am a8666422: Merge "moving accessibility image to callouts" into jb-dev
* commit 'a86664223612ba8bfaded5a2ae2178b6482d9fd5':
moving accessibility image to callouts
|
2012-08-01 08:51:53 -07:00 |
|
Peter Ng
|
edd7873c34
|
am c2eb7080: Merge "new extras section linking to design talks" into jb-dev
* commit 'c2eb7080481096777660aa726d46c2ccf21aca0d':
new extras section linking to design talks
|
2012-08-01 08:51:42 -07:00 |
|
Raph Levien
|
07cc2a4e30
|
am 38dcf95a: am 1ae49ab8: Merge "Fix bug 6892600 Font (character pairs) rendering issue" into jb-mr1-dev
* commit '38dcf95ad5c08e4578709c619f357634862225f2':
Fix bug 6892600 Font (character pairs) rendering issue
|
2012-07-31 19:34:51 -07:00 |
|
Raph Levien
|
38dcf95ad5
|
am 1ae49ab8: Merge "Fix bug 6892600 Font (character pairs) rendering issue" into jb-mr1-dev
* commit '1ae49ab8655baeb0ddf1944d0a66cd598122408a':
Fix bug 6892600 Font (character pairs) rendering issue
|
2012-07-31 19:29:24 -07:00 |
|
Raph Levien
|
1ae49ab865
|
Merge "Fix bug 6892600 Font (character pairs) rendering issue" into jb-mr1-dev
|
2012-07-31 19:26:55 -07:00 |
|
Romain Guy
|
cc4d056993
|
am 5d89b70a: am 413ab3a5: Merge "Improve gradients" into jb-mr1-dev
* commit '5d89b70a5df86526f5eb6bec7ece20d2dc90ac90':
Improve gradients
|
2012-07-31 19:00:58 -07:00 |
|
Romain Guy
|
5d89b70a5d
|
am 413ab3a5: Merge "Improve gradients" into jb-mr1-dev
* commit '413ab3a5a2065295080ae063a72a9a7e30f2d484':
Improve gradients
|
2012-07-31 18:58:18 -07:00 |
|
Romain Guy
|
413ab3a5a2
|
Merge "Improve gradients" into jb-mr1-dev
|
2012-07-31 18:55:44 -07:00 |
|
Romain Guy
|
42e1e0d482
|
Improve gradients
Avoid using textures for common gradients (two stops from 0.0 to 1.0)
Change-Id: Iff55d21b126c8cfc4cfb701669f2339c8f6b131a
|
2012-07-31 18:55:16 -07:00 |
|
Dianne Hackborn
|
7e1a9808c7
|
am 740edf94: am 3805e8ca: Merge "Optimize memory use of IntentResolver." into jb-mr1-dev
* commit '740edf947035d1bd841b63cf94bf51981b737b72':
Optimize memory use of IntentResolver.
|
2012-07-31 18:29:46 -07:00 |
|
Dianne Hackborn
|
740edf9470
|
am 3805e8ca: Merge "Optimize memory use of IntentResolver." into jb-mr1-dev
* commit '3805e8ca0a5ba05afd8e04e19e440bbbe3469b81':
Optimize memory use of IntentResolver.
|
2012-07-31 18:26:45 -07:00 |
|
Dianne Hackborn
|
3805e8ca0a
|
Merge "Optimize memory use of IntentResolver." into jb-mr1-dev
|
2012-07-31 18:24:25 -07:00 |
|
Dianne Hackborn
|
d31bf5948f
|
am 00840827: am 40e5df95: Merge "Make AtomicFile a public API. It\'s about time!" into jb-mr1-dev
* commit '008408277933afb23a95e080b09eed07d2575eda':
Make AtomicFile a public API. It's about time!
|
2012-07-31 18:15:26 -07:00 |
|
Dianne Hackborn
|
0084082779
|
am 40e5df95: Merge "Make AtomicFile a public API. It\'s about time!" into jb-mr1-dev
* commit '40e5df95ff9468cec0624ca7fb14e51c13e4b047':
Make AtomicFile a public API. It's about time!
|
2012-07-31 18:13:38 -07:00 |
|
Dianne Hackborn
|
40e5df95ff
|
Merge "Make AtomicFile a public API. It's about time!" into jb-mr1-dev
|
2012-07-31 18:11:03 -07:00 |
|
Dianne Hackborn
|
39606a007a
|
Make AtomicFile a public API. It's about time!
Change-Id: Ib34e294747405b7ab709cb0bbb2d9a0cc80ce86a
|
2012-07-31 17:54:52 -07:00 |
|
John Grossman
|
985eb88e90
|
Merge "common_time: Fix a small build warning."
|
2012-07-31 17:33:45 -07:00 |
|
Jeff Sharkey
|
a50393faf5
|
am 37f0fbf3: am 24d19fb6: Revert "API to adjust network stats."
* commit '37f0fbf35260e96cdb699326be63bf19ec4d567d':
Revert "API to adjust network stats."
|
2012-07-31 17:23:00 -07:00 |
|
Jeff Sharkey
|
37f0fbf352
|
am 24d19fb6: Revert "API to adjust network stats."
* commit '24d19fb6ab94cc5fd23f1c9a1d7916948a7fd571':
Revert "API to adjust network stats."
|
2012-07-31 17:19:34 -07:00 |
|
Jeff Sharkey
|
24d19fb6ab
|
Revert "API to adjust network stats."
|
2012-07-31 17:11:07 -07:00 |
|
John Grossman
|
f19c7a64a5
|
common_time: Fix a small build warning.
Change-Id: I9a3652c8191ec86089117dbe6c16ff8612a911a3
Signed-off-by: John Grossman <johngro@google.com>
|
2012-07-31 16:58:44 -07:00 |
|
Adam Powell
|
72b7c53c92
|
am 015b2c1e: am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events if it can\'t scroll." into jb-mr1-dev
* commit '015b2c1e0b9a9d0b3defb2958931b04386128590':
Don't let ScrollView intercept touch events if it can't scroll.
|
2012-07-31 16:46:01 -07:00 |
|
Adam Powell
|
015b2c1e0b
|
am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events if it can\'t scroll." into jb-mr1-dev
* commit '8ab8fbbf46d8779f53301e7f706f97608eed7117':
Don't let ScrollView intercept touch events if it can't scroll.
|
2012-07-31 16:43:49 -07:00 |
|
Adam Powell
|
8ab8fbbf46
|
Merge "Don't let ScrollView intercept touch events if it can't scroll." into jb-mr1-dev
|
2012-07-31 16:41:37 -07:00 |
|
Adam Powell
|
0278c2fcba
|
Don't let ScrollView intercept touch events if it can't scroll.
Bug 6872104
Change-Id: Iee643e052acc37485a8ec45b7af8be0783fb1a95
|
2012-07-31 16:39:32 -07:00 |
|
Peter Ng
|
a866642236
|
Merge "moving accessibility image to callouts" into jb-dev
|
2012-07-31 16:08:33 -07:00 |
|
Peter Ng
|
353474c0ac
|
moving accessibility image to callouts
Change-Id: Ia67240a5eced57803d4593269a509b28fe2ecf9c
|
2012-07-31 16:02:33 -07:00 |
|
Peter Ng
|
c2eb708048
|
Merge "new extras section linking to design talks" into jb-dev
|
2012-07-31 16:01:13 -07:00 |
|
Peter Ng
|
6a681afd38
|
new extras section linking to design talks
Change-Id: Ia16fb1a90f4f8e3d42dea978e17cea0ed6cd107e
|
2012-07-31 15:47:38 -07:00 |
|
Jason Sams
|
5e78b10e0d
|
am 1e6b7a64: am a9fa7b25: Merge "save 2ms replace div with mul." into jb-mr1-dev
* commit '1e6b7a6462c612c151bb25803c293dfd7ab68cd3':
save 2ms replace div with mul.
|
2012-07-31 15:34:08 -07:00 |
|
Jason Sams
|
1e6b7a6462
|
am a9fa7b25: Merge "save 2ms replace div with mul." into jb-mr1-dev
* commit 'a9fa7b25ddefc3ba4cbf30ce05453d5e3459dbe1':
save 2ms replace div with mul.
|
2012-07-31 15:32:05 -07:00 |
|
Jason Sams
|
a9fa7b25dd
|
Merge "save 2ms replace div with mul." into jb-mr1-dev
|
2012-07-31 15:30:29 -07:00 |
|
The Android Open Source Project
|
eed348a9fb
|
am d5b7c955: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'd5b7c9551b3c9ea557afeb234d0e9272b35d63fa':
Fix bug 6906134
|
2012-07-31 15:11:27 -07:00 |
|
The Android Open Source Project
|
d5b7c9551b
|
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic4f7a305b2a135879e19d4c7e517e7f1b02005b8
|
2012-07-31 15:08:13 -07:00 |
|
Scott Main
|
d8e9959366
|
am d6d0fb32: am 22a7b9de: am ba751a0a: am f284d492: docs: fix broken links
* commit 'd6d0fb32327d8fa1d43a8e8066d55952d7078d82':
docs: fix broken links
|
2012-07-31 15:05:56 -07:00 |
|
Scott Main
|
d6d0fb3232
|
am 22a7b9de: am ba751a0a: am f284d492: docs: fix broken links
* commit '22a7b9de5e7037edfa2b9df9f33974ea0a8e718a':
docs: fix broken links
|
2012-07-31 15:02:35 -07:00 |
|
Scott Main
|
22a7b9de5e
|
am ba751a0a: am f284d492: docs: fix broken links
* commit 'ba751a0adef55059a2ff6d64903d97309983c536':
docs: fix broken links
|
2012-07-31 14:59:53 -07:00 |
|
Scott Main
|
ba751a0ade
|
am f284d492: docs: fix broken links
* commit 'f284d49293aead609de5b83d601260cfd86b7978':
docs: fix broken links
|
2012-07-31 14:57:37 -07:00 |
|
The Android Open Source Project
|
a668cc4e48
|
am 50ce2526: (-s ours) am 9dcfff20: am ca4117ca: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '50ce25264492452ef2c2acd3ded3ae52e0b421e4':
|
2012-07-31 14:57:16 -07:00 |
|
The Android Open Source Project
|
50ce252644
|
am 9dcfff20: am ca4117ca: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '9dcfff205e05c62e97b5aabedaa8c30309b99738':
|
2012-07-31 14:54:57 -07:00 |
|