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

32794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
58e19ce8eb am e8b669cb: (-s ours) am 71d25778: Merge "Switch to SkSafeUnref for better portability" 
* commit 'e8b669cbd7b690349c908ce6c9ce3b342139de04':
  Switch to SkSafeUnref for better portability
 2011-05-12 15:52:03 -07:00
Irfan Sheriff
cc13621e36 Merge commit '09564fbb' into manualmerge 2011-05-12 15:47:28 -07:00
Jean-Baptiste Queru
d6c51aef6b am f247e545: Merge "Adapt to latest skia" 
* commit 'f247e545b521584bb778e79710c1e60ab814839e':
  Adapt to latest skia
 2011-05-12 15:38:18 -07:00
Jean-Baptiste Queru
40951a8cf1 am 6714e677: Merge "Ninepatch tweaks for better interop" 
* commit '6714e6774063aae7a8a7a80c36c89ec60170cb27':
  Ninepatch tweaks for better interop
 2011-05-12 15:38:15 -07:00
Jean-Baptiste Queru
0e4b2d5826 am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 
* commit '4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
  Tweak audio APIs for better forward/backward/sideways compatibility.
 2011-05-12 15:38:11 -07:00
Jean-Baptiste Queru
6546fee8cc am 71d25778: Merge "Switch to SkSafeUnref for better portability" 
* commit '71d25778c61327bf82d0e81cd78175a9ee74420a':
  Switch to SkSafeUnref for better portability
 2011-05-12 15:38:07 -07:00
Jean-Baptiste Queru
d698b563da Merge "Adapt to latest skia" 2011-05-12 15:09:51 -07:00
Teng-Hui Zhu
094766172f am a0e661b4: am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2 
* commit 'a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
  Fix the Uri parsing issue
 2011-05-12 15:05:29 -07:00
Dianne Hackborn
d040883030 am 97280816: am 0f1de9ad: New compat mode front end: UI and persistence. 
* commit '972808164adde6c0784e9c836d06219a9cf7eb7f':
  New compat mode front end: UI and persistence.
 2011-05-12 15:05:19 -07:00
Teng-Hui Zhu
b9c36527f1 am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2 
* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
  Fix the Uri parsing issue
 2011-05-12 15:01:56 -07:00
Dianne Hackborn
aef4c4a98f am 0f1de9ad: New compat mode front end: UI and persistence. 
* commit '0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
  New compat mode front end: UI and persistence.
 2011-05-12 15:01:53 -07:00
Jean-Baptiste Queru
c97843ba1f Merge "Ninepatch tweaks for better interop" 2011-05-12 14:24:09 -07:00
Jean-Baptiste Queru
fa5f5587ae Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 2011-05-12 14:19:41 -07:00
Jean-Baptiste Queru
cc5d30e103 Merge "Switch to SkSafeUnref for better portability" 2011-05-12 14:19:26 -07:00
Irfan Sheriff
a51147adb4 Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2 2011-05-12 14:18:03 -07:00
Irfan Sheriff
a4ae316ca4 Merge "DO NOT MERGE Define Protocol class" into honeycomb-mr2 2011-05-12 14:17:51 -07:00
Teng-Hui Zhu
4755b0da13 Merge "Fix the Uri parsing issue" into honeycomb-mr2 2011-05-12 14:11:25 -07:00
Wink Saville
d11e133a4e am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE 
* commit '76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
  Fix initialization of RouteInfo
 2011-05-12 14:03:31 -07:00
Wink Saville
adfda25efe Merge "Fix initialization of RouteInfo" into honeycomb-LTE 2011-05-12 13:26:44 -07:00
Irfan Sheriff
6bb3af87fd am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread 
* commit 'aa1fd70100d1af393c8d4ebe9cb36a8fa15a3633':
  Move Wifi Ap configuration to flat file
 2011-05-11 10:06:33 -07:00
Irfan Sheriff
f2def3b25c am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread 
* commit '8dd85f80ba9c463f5616b47eceb620fe21203f4f':
  Move Wifi Ap configuration to flat file
 2011-05-11 09:45:36 -07:00
Irfan Sheriff
ea08a66129 Merge "Move Wifi Ap configuration to flat file" into gingerbread 2011-05-11 09:15:48 -07:00
Robert Ly
8c7e0a8c6f am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic board 
* commit '65bab344789b248cdc9334523e3b04f5a2c155b4':
  doc change: adding link to pic board
 2011-05-11 09:11:41 -07:00
Robert Ly
ffee8c9dee am f3cdea93: am a45e4f4d: doc change: adding link to pic board 
* commit 'f3cdea937b8b659f959d5e77f4a17f749f85c6ae':
  doc change: adding link to pic board
 2011-05-11 09:08:42 -07:00
Robert Ly
6b9a781755 am a45e4f4d: doc change: adding link to pic board 
* commit 'a45e4f4df59e4037408f6b9c0ddf4a7c57eaa273':
  doc change: adding link to pic board
 2011-05-11 09:04:52 -07:00
Wink Saville
f4ae85550d am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE 
* commit 'db08ff768b144c6ad8b326300d95c0c60e40f2eb':
  Refactor IccRecords and IccCard
 2011-05-10 16:31:36 -07:00
Wink Saville
3448749e67 Merge "Refactor IccRecords and IccCard" into honeycomb-LTE 2011-05-10 16:28:33 -07:00
Conley Owens
74cfbe1239 am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descriptors." 
* commit '87d86044c0f15ae2ffc0350271c76ff874fb413b':
  Add missing clean-up of idmap file descriptors.
 2011-05-10 16:19:29 -07:00
Jake Hamby
49b2ebe8b3 resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp 
Change-Id: I2b569ada3baec2dc486296623063bc2b504c5e96
 2011-05-10 15:52:15 -07:00
Eric Fischer
eb03b6a1f4 am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '98041f02b471b100056c3dc16e50f04a059f9a58':
  Import revised translations.  DO NOT MERGE
 2011-05-10 14:27:23 -07:00
Eric Fischer
60490cc70a am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '270fbfede58e4971588755adfa7e70e0de07b8cf':
  Import revised translations.  DO NOT MERGE
 2011-05-10 14:23:46 -07:00
Eric Fischer
bfa17d2e4a am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '372592032a0e552ca30faadac9be823bd397910b':
  Import revised translations.  DO NOT MERGE
 2011-05-10 14:21:08 -07:00
Eric Fischer
228a3092a5 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-05-10 14:18:10 -07:00
Eric Fischer
48a4ba5779 am affca8fa: am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'affca8fa11aa731cdc8b4b4f2b5478f182b9fbbf':
  Import revised translations.  DO NOT MERGE
 2011-05-10 12:26:09 -07:00
Eric Fischer
04de9afdc5 am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'f3bd663c67fe3aa3e8ec728e90f19e3fa50c3fbd':
  Import revised translations.  DO NOT MERGE
 2011-05-10 12:21:32 -07:00
Eric Fischer
e320ebe0ff Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-10 12:18:21 -07:00
Joe Onorato
1a32a0db38 am 37c077d3: am 81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2 
* commit '37c077d3dc32cd42c145072b671a6d53563b0156':
  Move / copy some framework and systemui resources from xlarge to large.  The status bar now comes up on large tablets.
 2011-05-10 12:03:55 -07:00
Joe Onorato
a5c5ef11bb am 81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2 
* commit '81faa44c48911e4a63adaa1c92c5a40ea3c58ffb':
  Move / copy some framework and systemui resources from xlarge to large.  The status bar now comes up on large tablets.
 2011-05-10 12:01:40 -07:00
Joe Onorato
817262a8d9 Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2 2011-05-10 11:59:42 -07:00
Robert Greenwalt
10bfd9d59a am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE 
* commit 'e6848faceff58f84f671dbc73be08ef7890fea09':
  Fix the adding of host routes.
 2011-05-10 11:53:57 -07:00
Robert Greenwalt
9ae2705075 Merge "Fix the adding of host routes." into honeycomb-LTE 2011-05-10 11:51:36 -07:00
Dianne Hackborn
a1f89099d8 am 652dbb7d: am 837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2 
* commit '652dbb7dca84ee3b350225cb38824fe3773af42b':
  Fix scaling of batched motion events.
 2011-05-10 11:15:39 -07:00
Dianne Hackborn
edd292f8ce am 837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2 
* commit '837bdc4919aedfea8c0ba492d964eb921d4e302d':
  Fix scaling of batched motion events.
 2011-05-10 11:01:50 -07:00
Dianne Hackborn
9467d6c805 Merge "Fix scaling of batched motion events." into honeycomb-mr2 2011-05-10 10:58:44 -07:00
Dirk Dougherty
aec65a327e am e4e8dffd: am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1 
* commit 'e4e8dffd41c0f7aaf005418b71cae7738ad868d2':
  Doc change: add Android 3.1 highlights and version notes.
 2011-05-10 00:46:26 -07:00
Scott Main
8fcfae410e am 6b2c8f00: am fef7b625: am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen fil 
* commit '6b2c8f00c95d05a8ca410ff74451fd0701f36119':
  docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
 2011-05-10 00:46:21 -07:00
Dirk Dougherty
a14345a16e am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1 
* commit '0d5196b972044da44a844acd9cdffde9d5aa696d':
  Doc change: add Android 3.1 highlights and version notes.
 2011-05-10 00:37:02 -07:00
Scott Main
c60dbd0f3c am fef7b625: am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and ad 
* commit 'fef7b62506a74d0133b60fd1d6ae9bf54bf599c9':
  docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
 2011-05-10 00:36:59 -07:00
Dirk Dougherty
296d68f8aa am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1 
* commit '5f8f0a0d40675bc4d373121ffdd22730f3701662':
  Doc change: add Android 3.1 highlights and version notes.
 2011-05-10 00:34:09 -07:00
Scott Main
bdc375c34f am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen supp 
* commit '7f3cf449fe1b90b902a37ddc3c05ec7aa236e584':
  docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
 2011-05-10 00:34:06 -07:00