summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 5907ffa4: am a6c52938: Merge "add new video/audio presence icons in the fr...Wei Huang2010-06-1514-34/+43
|\
| * am a6c52938: Merge "add new video/audio presence icons in the framework resou...Wei Huang2010-06-1514-34/+43
| |\
| | * Merge "add new video/audio presence icons in the framework resource dirs, and...Wei Huang2010-06-1514-34/+43
| | |\
| | | * add new video/audio presence icons in the framework resource dirs, and make t...Wei Huang2010-06-1514-34/+43
* | | | resolved conflicts for merge of 2f6f6240 to masterYing Wang2010-06-1515-1785/+0
|\ \ \ \ | |/ / /
| * | | am 3137f8c5: am 6567adf8: Move android-common to framework/exYing Wang2010-06-1515-1780/+0
| |\ \ \ | | |/ /
| | * | am 6567adf8: Move android-common to framework/exYing Wang2010-06-1515-1780/+0
| | |\ \
| | | * | Move android-common to framework/exYing Wang2010-06-1515-1780/+0
* | | | | am c43f4784: am 987e223d: am 27357fc0: Merge "Use the droidcore goal with dis...Joe Onorato2010-06-151-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 987e223d: am 27357fc0: Merge "Use the droidcore goal with dist-for-goals."...Joe Onorato2010-06-151-1/+1
| |\ \ \ \ | | |/ / /
| | * | | am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyoJoe Onorato2010-06-151-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge "Use the droidcore goal with dist-for-goals." into froyoJoe Onorato2010-06-151-1/+1
| | | |\ \
| | | | * | Use the droidcore goal with dist-for-goals.Joe Onorato2010-06-101-1/+1
* | | | | | am 3d6ea3bd: am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are pre...Joe Onorato2010-06-152-1/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we...Joe Onorato2010-06-152-1/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an...Joe Onorato2010-06-152-1/+8
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only bui...Joe Onorato2010-06-152-1/+8
| | | |\ \ \ | | | | |/ /
| | | | * | The aapt and aidl tools are prebuilt when we're doing an apps-only build, so ...Joe Onorato2010-06-102-1/+8
* | | | | | Merge "update image processing."Jason Sams2010-06-153-41/+57
|\ \ \ \ \ \
| * | | | | | update image processing.Jason Sams2010-06-143-41/+57
* | | | | | | Allow the use of styles with LinearLayout, make "useLargestChild" attr public.Romain Guy2010-06-156-16/+103
* | | | | | | am 56b64c75: am ac8b0d47: Merge "This patch enables each omx instance to have...James Dong2010-06-152-16/+22
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am ac8b0d47: Merge "This patch enables each omx instance to have a separate m...James Dong2010-06-152-16/+22
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "This patch enables each omx instance to have a separate message dispat...James Dong2010-06-152-16/+22
| | |\ \ \ \ \
| | | * | | | | This patch enables each omx instance to have a separate message dispatcher, andJames Dong2010-06-142-16/+22
* | | | | | | | am 522d9907: am 0014296b: am 457738e6: Merge "docs: add information about kno...Scott Main2010-06-151-47/+196
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 0014296b: am 457738e6: Merge "docs: add information about known issues in ...Scott Main2010-06-151-47/+196
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 457738e6: Merge "docs: add information about known issues in resource matc...Scott Main2010-06-151-47/+196
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge "docs: add information about known issues in resource matching for scre...Scott Main2010-06-151-47/+196
| | | |\ \ \ \ \
| | | | * | | | | docs: add information about known issues in resource matchingScott Main2010-06-141-47/+196
* | | | | | | | | am fb48f3a2: am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyoScott Main2010-06-151-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyoScott Main2010-06-151-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 322e7e47: Merge "docs: fix markup error" into froyoScott Main2010-06-151-2/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Merge "docs: fix markup error" into froyoScott Main2010-06-151-2/+2
| | | |\ \ \ \ \
| | | | * | | | | docs: fix markup errorScott Main2010-06-111-2/+2
* | | | | | | | | Merge "MTP: Use stat.st_mode instead of dirent.d_type to determine file type."Mike Lockwood2010-06-151-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MTP: Use stat.st_mode instead of dirent.d_type to determine file type.Mike Lockwood2010-06-141-2/+2
* | | | | | | | | | Merge "MediaScanner: Fix handling of files with dirent.d_type == DT_UNKNOWN"Mike Lockwood2010-06-151-10/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | MediaScanner: Fix handling of files with dirent.d_type == DT_UNKNOWNMike Lockwood2010-06-141-10/+8
* | | | | | | | | | am 5126633a: am 2d468c5d: Make sure SurfaceView use a 565 surface when reques...Mathias Agopian2010-06-141-0/+6
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 2d468c5d: Make sure SurfaceView use a 565 surface when requesting an OPAQU...Mathias Agopian2010-06-141-0/+6
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.Mathias Agopian2010-06-141-0/+6
| | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | Merge "Comment out rsqrt for now. Long-term: Need to figur out why rsqrt caus...Shih-wei Liao2010-06-141-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Comment out rsqrt for now. Long-term: Need to figur out why rsqrt caused slan...Shih-wei Liao2010-06-141-2/+2
* | | | | | | | | | Merge "MTP device: Read manufacturer name and serial number from system prope...Mike Lockwood2010-06-142-3/+10
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | MTP device: Read manufacturer name and serial number from system properties.Mike Lockwood2010-06-142-3/+10
* | | | | | | | | | Merge "fix bugs introduced by I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591"Vasu Nori2010-06-142-80/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix bugs introduced by I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591Vasu Nori2010-06-142-80/+10
* | | | | | | | | | | am e0e5da0d: am 96e59eb8: Merge "Support for multiple tests" into gingerbreadJeff Brown2010-06-142-8/+18
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 96e59eb8: Merge "Support for multiple tests" into gingerbreadJeff Brown2010-06-142-8/+18
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |