Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Update Calendars table to v300" | RoboErik | 2011-05-11 | 1 | -64/+101 |
|\ | |||||
| * | Update Calendars table to v300 | RoboErik | 2011-05-10 | 1 | -64/+101 |
* | | Merge "Add ROOT_ID to Accounts column" | John Reck | 2011-05-11 | 1 | -0/+7 |
|\ \ | |||||
| * | | Add ROOT_ID to Accounts column | John Reck | 2011-05-10 | 1 | -0/+7 |
* | | | Merge "Expose the track informational event for testing" | James Dong | 2011-05-11 | 1 | -2/+78 |
|\ \ \ | |||||
| * | | | Expose the track informational event for testing | James Dong | 2011-05-11 | 1 | -2/+78 |
* | | | | Merge "fix libagl surface initialization" | Mathias Agopian | 2011-05-11 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | fix libagl surface initialization | Mathias Agopian | 2011-05-11 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | am f450fd6a: am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configur... | Irfan Sheriff | 2011-05-11 | 0 | -0/+0 |
|\ \ \ \ | |||||
| * \ \ \ | am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configuration to flat... | Irfan Sheriff | 2011-05-11 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread | Irfan Sheriff | 2011-05-11 | 2 | -52/+120 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge "Move Wifi Ap configuration to flat file" into gingerbread | Irfan Sheriff | 2011-05-11 | 2 | -52/+120 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Move Wifi Ap configuration to flat file | Irfan Sheriff | 2011-05-09 | 2 | -52/+120 |
* | | | | | | | | am 9d93c9c4: am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link t... | Robert Ly | 2011-05-11 | 1 | -278/+364 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic board | Robert Ly | 2011-05-11 | 1 | -278/+364 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | am f3cdea93: am a45e4f4d: doc change: adding link to pic board | Robert Ly | 2011-05-11 | 1 | -278/+364 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | am a45e4f4d: doc change: adding link to pic board | Robert Ly | 2011-05-11 | 1 | -278/+364 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | doc change: adding link to pic board | Robert Ly | 2011-05-10 | 1 | -278/+364 |
* | | | | | | | | | | | am e86dbac5: am db08ff76: Merge "Refactor IccRecords and IccCard" into honeyc... | Wink Saville | 2011-05-11 | 17 | -169/+226 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE | Wink Saville | 2011-05-10 | 17 | -169/+226 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "Refactor IccRecords and IccCard" into honeycomb-LTE | Wink Saville | 2011-05-10 | 17 | -169/+226 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Refactor IccRecords and IccCard | Wink Saville | 2011-05-10 | 17 | -169/+226 |
* | | | | | | | | | | | | am 041aa34e: am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap f... | Conley Owens | 2011-05-11 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descripto... | Conley Owens | 2011-05-10 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | am bcd029b6: Merge "Add missing clean-up of idmap file descriptors." | Conley Owens | 2011-05-05 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge "Add missing clean-up of idmap file descriptors." | Conley Owens | 2011-05-05 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | Add missing clean-up of idmap file descriptors. | MÃ¥rten Kongstad | 2011-05-05 | 1 | -0/+3 |
| | | |/ / / / / / / / / / | |||||
* | | | | | | | | | | | | | am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp | Jake Hamby | 2011-05-11 | 14 | -445/+1665 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp | Jake Hamby | 2011-05-10 | 14 | -445/+1665 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | am 4d53cb02: Merge "Enable support for SMS national language shift tables." i... | Jake Hamby | 2011-05-05 | 14 | -462/+1675 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge "Enable support for SMS national language shift tables." into gingerbread | Jake Hamby | 2011-05-05 | 14 | -462/+1675 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | Enable support for SMS national language shift tables. | Jake Hamby | 2011-04-06 | 14 | -462/+1675 |
* | | | | | | | | | | | | | | am 6819c677: (-s ours) am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge... | Eric Fischer | 2011-05-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised transl... | Eric Fischer | 2011-05-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO N... | Eric Fischer | 2011-05-10 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" int... | Eric Fischer | 2011-05-10 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | |||||
| | | | * | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 | Eric Fischer | 2011-05-10 | 3 | -15/+15 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-04-29 | 3 | -15/+15 |
* | | | | | | | | | | | | | | | am ca43ef6b: (-s ours) am affca8fa: am f3bd663c: Merge "Import revised transl... | Eric Fischer | 2011-05-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | am affca8fa: am f3bd663c: Merge "Import revised translations. DO NOT MERGE" ... | Eric Fischer | 2011-05-10 | 6 | -18/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycom... | Eric Fischer | 2011-05-10 | 6 | -18/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 | Eric Fischer | 2011-05-10 | 6 | -18/+18 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-05-09 | 6 | -18/+18 |
* | | | | | | | | | | | | | | | | am 0fe56853: am 37c077d3: am 81faa44c: Merge "Move / copy some framework and ... | Joe Onorato | 2011-05-11 | 128 | -0/+91 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | am 37c077d3: am 81faa44c: Merge "Move / copy some framework and systemui reso... | Joe Onorato | 2011-05-10 | 128 | -0/+91 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | am 81faa44c: Merge "Move / copy some framework and systemui resources from xl... | Joe Onorato | 2011-05-10 | 128 | -0/+91 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | Merge "Move / copy some framework and systemui resources from xlarge to large... | Joe Onorato | 2011-05-10 | 128 | -0/+91 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | Move / copy some framework and systemui resources from xlarge to large. The ... | Joe Onorato | 2011-05-10 | 128 | -0/+91 |
* | | | | | | | | | | | | | | | | | am 441bc9a6: am e6848fac: Merge "Fix the adding of host routes." into honeyco... | Robert Greenwalt | 2011-05-11 | 3 | -28/+132 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE | Robert Greenwalt | 2011-05-10 | 3 | -28/+132 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / |