Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | am 288471d8: DO NOT MERGE. Load assets in place instead of deferring until draw. | Romain Guy | 2010-08-19 | 1 | -4/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | DO NOT MERGE. Load assets in place instead of deferring until draw. | Romain Guy | 2010-08-19 | 1 | -4/+2 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | am 54d41379: Merge "Add OBB flags to support overlays" into gingerbread | Kenny Root | 2010-08-19 | 3 | -3/+28 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge "Add OBB flags to support overlays" into gingerbread | Kenny Root | 2010-08-19 | 3 | -3/+28 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| | * | | | | | | | | Add OBB flags to support overlays | Kenny Root | 2010-08-18 | 3 | -3/+28 | |
* | | | | | | | | | | am e0c8582e: Merge "Improve orientation sensing when waking up while flat." i... | Steve Howard | 2010-08-19 | 1 | -15/+23 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge "Improve orientation sensing when waking up while flat." into gingerbread | Steve Howard | 2010-08-19 | 1 | -15/+23 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Improve orientation sensing when waking up while flat. | Steve Howard | 2010-08-18 | 1 | -15/+23 | |
| | |/ / / / / / / / | ||||||
* | | | | | | | | | | am 8d124f70: Merge "Fix a bug, where one thread is using JNIEnv associated wi... | Wei-Ta Chen | 2010-08-19 | 2 | -9/+22 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge "Fix a bug, where one thread is using JNIEnv associated with another th... | Wei-Ta Chen | 2010-08-19 | 2 | -9/+22 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix a bug, where one thread is using JNIEnv associated with another thread. | Wei-Ta Chen | 2010-08-19 | 2 | -9/+22 | |
* | | | | | | | | | | | am cf6d2a1d: Merge "Fix issue #2845673: android:exported="false" is not obeye... | Dianne Hackborn | 2010-08-18 | 3 | -18/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Fix issue #2845673: android:exported="false" is not obeyed | Dianne Hackborn | 2010-08-18 | 3 | -18/+6 | |
* | | | | | | | | | | | am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" in... | Robert Greenwalt | 2010-08-18 | 1 | -1/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread | Robert Greenwalt | 2010-08-18 | 1 | -1/+29 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | DO NOT MERGE Do not kill sockets going default->hipri | Robert Greenwalt | 2010-08-18 | 1 | -1/+29 | |
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | am 11709ab0: Merge "Avoid unnecessary SharedPrefences disk writes." into ging... | Brad Fitzpatrick | 2010-08-18 | 1 | -6/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread | Brad Fitzpatrick | 2010-08-18 | 1 | -6/+28 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Avoid unnecessary SharedPrefences disk writes. | Brad Fitzpatrick | 2010-08-17 | 1 | -6/+28 | |
* | | | | | | | | | | | | am 8ad86fef: Merge "Improve documentation of getAltitude" into gingerbread | Mathias Agopian | 2010-08-18 | 1 | -1/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge "Improve documentation of getAltitude" into gingerbread | Mathias Agopian | 2010-08-18 | 1 | -1/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Improve documentation of getAltitude | Mathias Agopian | 2010-08-18 | 1 | -1/+16 | |
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | am f2af87b3: Merge "Making sure the draw time is measured." into gingerbread | Konstantin Lopyrev | 2010-08-18 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge "Making sure the draw time is measured." into gingerbread | Konstantin Lopyrev | 2010-08-18 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Making sure the draw time is measured. | Konstantin Lopyrev | 2010-08-18 | 1 | -1/+2 | |
| | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | am c8696023: Merge "Document that autoFocus must be called in auto and macro ... | Wu-cheng Li | 2010-08-18 | 1 | -3/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge "Document that autoFocus must be called in auto and macro mode." into g... | Wu-cheng Li | 2010-08-18 | 1 | -3/+12 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | Document that autoFocus must be called in auto and macro mode. | Wu-cheng Li | 2010-08-17 | 1 | -3/+12 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
* | | | | | | | | | | am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into ... | Steve Howard | 2010-08-18 | 1 | -9/+16 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge "Fix up handling of null fields in DownloadManager." into gingerbread | Steve Howard | 2010-08-18 | 1 | -9/+16 | |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | Fix up handling of null fields in DownloadManager. | Steve Howard | 2010-08-17 | 1 | -9/+16 | |
| | |/ / / / / / / | ||||||
* | | | | | | | | | am 72ce4235: Merge "Fix possible race conditions during channel unregistratio... | Jeff Brown | 2010-08-18 | 1 | -30/+69 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "Fix possible race conditions during channel unregistration." into ging... | Jeff Brown | 2010-08-17 | 1 | -30/+69 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Fix possible race conditions during channel unregistration. | Jeff Brown | 2010-08-17 | 1 | -30/+69 | |
* | | | | | | | | | | am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte paramete... | Daisuke Miyakawa | 2010-08-18 | 6 | -15/+125 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge "Make vCard importer/exporter aware of multi-byte parameters." into gin... | Daisuke Miyakawa | 2010-08-17 | 6 | -15/+125 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Make vCard importer/exporter aware of multi-byte parameters. | Daisuke Miyakawa | 2010-08-17 | 6 | -15/+125 | |
* | | | | | | | | | | | DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp | Jean-Baptiste Queru | 2010-08-18 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | DO NOT MERGE WifiLock extensions for high performance mode | Irfan Sheriff | 2010-08-17 | 1 | -0/+10 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Revert "- updates NetUtils to use new libnetutils headers" | Jean-Baptiste Queru | 2010-08-18 | 2 | -2/+77 | |
* | | | | | | | | | | am b3e957bb: Merge "New download manager error code when we can\'t resume." i... | Steve Howard | 2010-08-17 | 2 | -1/+21 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge "New download manager error code when we can't resume." into gingerbread | Steve Howard | 2010-08-17 | 2 | -1/+21 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | New download manager error code when we can't resume. | Steve Howard | 2010-08-16 | 2 | -1/+21 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
* | | | | | | | | | | am 209e6518: Merge "Make the LED colors when charging customizable by the ven... | Jean-Baptiste Queru | 2010-08-17 | 1 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge "Make the LED colors when charging customizable by the vendor" | Jean-Baptiste Queru | 2010-08-17 | 1 | -0/+15 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Make the LED colors when charging customizable by the vendor | Kenneth Andersson | 2010-08-03 | 1 | -0/+15 | |
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | ||||||
* | | | | | | | | | | am f1f48bc7: Do JPEG tile-based decoding. | Joseph Wen | 2010-08-17 | 11 | -140/+510 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Do JPEG tile-based decoding. | Joseph Wen | 2010-08-17 | 11 | -140/+510 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | am 833533c9: Improve Display javadoc slightly | Mathias Agopian | 2010-08-16 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Improve Display javadoc slightly | Mathias Agopian | 2010-08-16 | 1 | -1/+2 | |
| | |_|/ / / / / | |/| | | | | | |