ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
34,170 Commits 2 Branches 0 Tags 54 MiB
f83209bd9a
Commit Graph

34170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
ec2c9751d8 am 63446167: (-s ours) am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 
* commit '63446167b9d6d9ed3410320d17e8fe816caf6c42':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
 2011-05-16 13:11:27 -07:00
Dianne Hackborn
cbf3ce51c8 am f97ed771: (-s ours) am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit 'f97ed771979162c4a2a75959c57fb793438a3a8b':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 13:11:24 -07:00
Dianne Hackborn
b181f7ffa2 Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 2011-05-16 13:10:23 -07:00
Mike Lockwood
cd44b8a486 resolved conflicts for merge of b107f4de to master 
Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e
 2011-05-16 16:08:12 -04:00
Dianne Hackborn
2737840be4 am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 
* commit 'fddd927fb78bb206287203f4f447a416b525115a':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
 2011-05-16 13:04:49 -07:00
Wink Saville
7fa7b50577 am 2ead69e1: am fe5b5d37: Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE 
* commit '2ead69e11631b9bc2b12fe0cd8dbd27155559276':
  Implement incremental data stall recovery in GSM DCT
 2011-05-16 13:03:21 -07:00
Dianne Hackborn
ea5d261564 am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 
* commit '9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
 2011-05-16 13:02:57 -07:00
Dianne Hackborn
a84e8649da am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit 'd90a2c4d4463085155444efb07eba2d6579b444a':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 13:01:38 -07:00
Dianne Hackborn
9b076812bb Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 2011-05-16 13:01:07 -07:00
Dianne Hackborn
1c8ed2395c am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 12:57:00 -07:00
Dianne Hackborn
dac5784ab3 Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 2011-05-16 12:54:22 -07:00
Mike Lockwood
3a71e2c785 resolved conflicts for merge of fc4a3d37 to master 
Change-Id: I40f603ba9330c3e882f4d58398095f4094725b21
 2011-05-16 15:49:53 -04:00
Mike Lockwood
6412fa9d1f am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 
* commit 'e23639e0386735df50ad208078f638c38f662d42':
  MTP: Have GetStorageInfo command return correct storage type for removable storage
 2011-05-16 12:41:25 -07:00
Wink Saville
c497baf296 am fe5b5d37: Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE 
* commit 'fe5b5d3700a5c67b5e8fcee324efe0fa24c4622c':
  Implement incremental data stall recovery in GSM DCT
 2011-05-16 12:41:16 -07:00
Mike Lockwood
ebce5c6933 am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 
* commit 'b822d2464dc59056f736b0c49f0ac514c7cbb9d9':
  StorageManager:  Clean up and generalize storage configuration resources
 2011-05-16 12:38:36 -07:00
Mike Lockwood
84de4bdffb am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 
* commit '15afd076d6070374cbb4f9dcbe28dda67caa0718':
  MTP: Have GetStorageInfo command return correct storage type for removable storage
 2011-05-16 12:38:18 -07:00
Wink Saville
2ba0507598 Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE 2011-05-16 12:37:55 -07:00
Robert Ly
7bdc9c0105 am 0c5ae3fc: am 1f2a335f: am 79d3f630: am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '0c5ae3fc8892a06e3dd5192d24f0b46bb59c769b':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:37:46 -07:00
Mike Lockwood
39dda65713 am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 
* commit '0a93d875527c52183080b63a0b19d567856952af':
  StorageManager:  Clean up and generalize storage configuration resources
 2011-05-16 12:36:29 -07:00
Mike Lockwood
f3be466e9f Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 2011-05-16 12:34:35 -07:00
Robert Ly
cd60e524cf am 1f2a335f: am 79d3f630: am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '1f2a335f98503bab178d1d868a9cba0451481b7d':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:34:26 -07:00
Mike Lockwood
f35699af48 Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 2011-05-16 12:34:02 -07:00
Robert Ly
e8fecfb403 am 79d3f630: am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '79d3f6305fc7dda68faf674e1c500f97cc4dd570':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:31:48 -07:00
Robert Ly
60aaec5f01 am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '904f48107e2843a1e255872afac8ddf8e9513ca4':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:29:17 -07:00
Guang Zhu
5ed1f30cd1 Merge "change how test sets timeout for webkit dump" 2011-05-16 11:28:17 -07:00
Gilles Debunne
6a8c0d38a2 Merge "Links in Environment javadoc" 2011-05-16 11:14:41 -07:00
Dianne Hackborn
a8115aa2dd am fbdf9df0: (-s ours) am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 
* commit 'fbdf9df053800afb25453630d11bd48cbc068271':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
 2011-05-16 11:12:45 -07:00
Dirk Dougherty
0ba35e3fff am b131d288: am 4bfc1cc0: am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit 'b131d288f2c90daf95c678ad12c9708082a2977a':
  Doc change: typo fix
 2011-05-16 11:10:18 -07:00
Scott Main
64423a402a am 833b325f: am 81dd428d: am 582c1361: am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '833b325f5a22f88c1ab84eef5b8caf79cd292036':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:10:15 -07:00
Dianne Hackborn
30c47d2f95 am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 
* commit '2a20583a5f436d66ab73cd6c0fdc73e59a3cecad':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
 2011-05-16 11:09:31 -07:00
Dirk Dougherty
26d5761d23 am 4bfc1cc0: am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit '4bfc1cc0a9bea7d7529b6c92daeb65660961b7d4':
  Doc change: typo fix
 2011-05-16 11:07:02 -07:00
Scott Main
7468fa3c2e am 81dd428d: am 582c1361: am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '81dd428d70ae14dcceae3bab5271d726abf2f324':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:06:59 -07:00
Dianne Hackborn
77c7b95e11 am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 
* commit '700ab1c75862babba90f54e02bdc877becd4f4fc':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
 2011-05-16 11:06:28 -07:00
Dirk Dougherty
20530813e6 am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit '8b8bfc5d28d9746bf30b2de45f879d9481b07d6f':
  Doc change: typo fix
 2011-05-16 11:03:56 -07:00
Scott Main
59154d5e2c am 582c1361: am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '582c1361e8a6443812a97f18094be1f8279645a0':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:03:53 -07:00
Dianne Hackborn
658d84fad7 Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 2011-05-16 11:02:29 -07:00
Dirk Dougherty
c1fca8eaf9 am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit 'babf844f4606f07de0e3349b5847faa2f8f208cc':
  Doc change: typo fix
 2011-05-16 11:01:44 -07:00
Scott Main
19d44f26e7 am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '5eba0e98d1f7ed8f9d04a44adb8d8a37ef7f4659':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:01:42 -07:00
Fabrice Di Meglio
bb9bcdf32f Merge "Fix bug #4415576 Gmail text looks broken" 2011-05-16 11:00:02 -07:00
Dirk Dougherty
56526b508a Merge "Doc change: typo fix" into honeycomb-mr1 2011-05-16 10:59:00 -07:00
Andreas Huber
5b9b489c0a Merge "Fix module tags on stagefright software decoders." 2011-05-16 10:47:50 -07:00
James Dong
b19a80f73a Merge "Support platform and camera dependent recording start time offset" 2011-05-16 10:46:33 -07:00
Scott Main
aa3ddc98e2 am 8e3fdf81: am fa5a08be: am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel 
* commit '8e3fdf812b7684727d69b7326a02d7fdf8472e3f':
  docs: add oem driver for alcatel
 2011-05-16 10:40:56 -07:00
Scott Main
039fc0a1ab am fa5a08be: am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel 
* commit 'fa5a08beed19f05b1946db55bd3ff9c13600f9f4':
  docs: add oem driver for alcatel
 2011-05-16 10:37:33 -07:00
Scott Main
82808fb000 am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel 
* commit '1ff0131e77e625af3100720a3552dc1f4064421d':
  docs: add oem driver for alcatel
 2011-05-16 10:24:28 -07:00
Scott Main
45d5a051ad am fc0ea7ea: docs: add oem driver for alcatel 
* commit 'fc0ea7ea5de429d9eea7f13bca42b98081d38dc5':
  docs: add oem driver for alcatel
 2011-05-16 10:20:59 -07:00
Wink Saville
50147fcf4f am 7a2a87d6: am a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE 
* commit '7a2a87d6457885c5d3d4dbf335be101aa9c5c3ab':
  Support for Vendor RIL dump of baseband logs
 2011-05-15 14:47:45 -07:00
Wink Saville
a0b49c7279 am 58779700: am 92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE 
* commit '58779700df18d52edf1102c6fcb3731f28d37a94':
  Telephony: Handle Icc Status Changed Event.
 2011-05-15 14:47:42 -07:00
Wink Saville
ff78de7c53 am a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE 
* commit 'a1c29d30f342c2d3dbf7022f1b130934c2519b81':
  Support for Vendor RIL dump of baseband logs
 2011-05-15 14:43:52 -07:00
Wink Saville
51d3a78406 am 92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE 
* commit '92cc1d20ae0e3dc7e0618027967145e26c1cb6e2':
  Telephony: Handle Icc Status Changed Event.
 2011-05-15 14:43:49 -07:00