summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Update Calendars table to v300"RoboErik2011-05-111-64/+101
|\
| * Update Calendars table to v300RoboErik2011-05-101-64/+101
* | Merge "Add ROOT_ID to Accounts column"John Reck2011-05-111-0/+7
|\ \
| * | Add ROOT_ID to Accounts columnJohn Reck2011-05-101-0/+7
* | | Merge "Expose the track informational event for testing"James Dong2011-05-111-2/+78
|\ \ \
| * | | Expose the track informational event for testingJames Dong2011-05-111-2/+78
* | | | Merge "fix libagl surface initialization"Mathias Agopian2011-05-111-0/+4
|\ \ \ \
| * | | | fix libagl surface initializationMathias Agopian2011-05-111-0/+4
| |/ / /
* | | | am f450fd6a: am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configur...Irfan Sheriff2011-05-110-0/+0
|\ \ \ \
| * \ \ \ am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configuration to flat...Irfan Sheriff2011-05-110-0/+0
| |\ \ \ \
| | * \ \ \ am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbreadIrfan Sheriff2011-05-112-52/+120
| | |\ \ \ \
| | | * \ \ \ Merge "Move Wifi Ap configuration to flat file" into gingerbreadIrfan Sheriff2011-05-112-52/+120
| | | |\ \ \ \
| | | | * | | | Move Wifi Ap configuration to flat fileIrfan Sheriff2011-05-092-52/+120
* | | | | | | | am 9d93c9c4: am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link t...Robert Ly2011-05-111-278/+364
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic boardRobert Ly2011-05-111-278/+364
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ am f3cdea93: am a45e4f4d: doc change: adding link to pic boardRobert Ly2011-05-111-278/+364
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ am a45e4f4d: doc change: adding link to pic boardRobert Ly2011-05-111-278/+364
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | doc change: adding link to pic boardRobert Ly2011-05-101-278/+364
* | | | | | | | | | | am e86dbac5: am db08ff76: Merge "Refactor IccRecords and IccCard" into honeyc...Wink Saville2011-05-1117-169/+226
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTEWink Saville2011-05-1017-169/+226
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Refactor IccRecords and IccCard" into honeycomb-LTEWink Saville2011-05-1017-169/+226
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Refactor IccRecords and IccCardWink Saville2011-05-1017-169/+226
* | | | | | | | | | | | am 041aa34e: am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap f...Conley Owens2011-05-111-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descripto...Conley Owens2011-05-101-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."Conley Owens2011-05-051-0/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "Add missing clean-up of idmap file descriptors."Conley Owens2011-05-051-0/+3
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Add missing clean-up of idmap file descriptors.MÃ¥rten Kongstad2011-05-051-0/+3
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aospJake Hamby2011-05-1114-445/+1665
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | resolved conflicts for merge of 18cc814c to honeycomb-plus-aospJake Hamby2011-05-1014-445/+1665
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 4d53cb02: Merge "Enable support for SMS national language shift tables." i...Jake Hamby2011-05-0514-462/+1675
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Enable support for SMS national language shift tables." into gingerbreadJake Hamby2011-05-0514-462/+1675
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Enable support for SMS national language shift tables.Jake Hamby2011-04-0614-462/+1675
* | | | | | | | | | | | | | am 6819c677: (-s ours) am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge...Eric Fischer2011-05-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised transl...Eric Fischer2011-05-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO N...Eric Fischer2011-05-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-05-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1Eric Fischer2011-05-103-15/+15
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-04-293-15/+15
* | | | | | | | | | | | | | | am ca43ef6b: (-s ours) am affca8fa: am f3bd663c: Merge "Import revised transl...Eric Fischer2011-05-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am affca8fa: am f3bd663c: Merge "Import revised translations. DO NOT MERGE" ...Eric Fischer2011-05-106-18/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycom...Eric Fischer2011-05-106-18/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2Eric Fischer2011-05-106-18/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-05-096-18/+18
* | | | | | | | | | | | | | | | am 0fe56853: am 37c077d3: am 81faa44c: Merge "Move / copy some framework and ...Joe Onorato2011-05-11128-0/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 37c077d3: am 81faa44c: Merge "Move / copy some framework and systemui reso...Joe Onorato2011-05-10128-0/+91
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 81faa44c: Merge "Move / copy some framework and systemui resources from xl...Joe Onorato2011-05-10128-0/+91
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge "Move / copy some framework and systemui resources from xlarge to large...Joe Onorato2011-05-10128-0/+91
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Move / copy some framework and systemui resources from xlarge to large. The ...Joe Onorato2011-05-10128-0/+91
* | | | | | | | | | | | | | | | | am 441bc9a6: am e6848fac: Merge "Fix the adding of host routes." into honeyco...Robert Greenwalt2011-05-113-28/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTERobert Greenwalt2011-05-103-28/+132
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /