Commits

Show all
Author Commit Message Labels Comments Date
Scott Main
Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button." into ics-mr0
Scott Main
docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button. Change-Id: I829c4fb134d6f5c3cee82fb86958d23ef64e8481
tnorbye-google
Build fix - include sdk/lint in build. do not merge. (cherry picked from commit 4377cc701a0bef32aaff34d0d119974544fd20d6) Change-Id: I28dd89ad6471c82d344ecf88cecb2b96361b2050
Bart Sears
ICS MR0.1 will be version 4.0.2 - do not merge Change-Id: I35db6befcdfc421da8eb959285e61856c7ed2826
The Android Open Source Project
Reconcile with ics-factoryrom-2-release Change-Id: I2059be2fb54d852023cb4e4b96493ff6a934ffe0
The Android Automerger
ITL41D
Doug Zongker
use frozensets to represent APK cert sets Change-Id: Ic92c83be0c3f6a76bf1bd21f0216cd1b87586959
The Android Automerger
ITL41C
The Android Automerger
ITL41B
The Android Automerger
ITL41
Doug Zongker
to be upgraded, APKs must have exactly the same set of certs Change-Id: I0d528d3d55e5ee553e57e63ed1f998172c6306f8
The Android Automerger
ITL39B
The Android Automerger
ITL39
The Android Automerger
ITL35B
The Android Automerger
ITL35
James Dong
Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4 related-to-bug: 5566262
James Dong
Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4 related-to-bug: 5566262
The Android Automerger
ITL34B
The Android Automerger
ITL34
Brian Muramatsu
Stop Packaging Old CTS Test Runner Files Bug 5563917 This stops packaging the startcts script and the cts.jar into the android-cts.zip. Since we are only testing using Tradefed, we should prevent confusion by removing the old test runner. Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f
The Android Automerger
ITL33D
The Android Automerger
ITL33C
The Android Automerger
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger
ITL33B
The Android Automerger
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger
ITL33
The Android Automerger
ITL33
The Android Open Source Project
Reconcile with ics-factoryrom-2-release Change-Id: I5488896eaf252e88fd0a7c8052c1e27be3f91e6f
The Android Automerger
ITL31
The Android Open Source Project
Reconcile with ics-factoryrom-2-release Change-Id: I7f53fdbe6acf900cdd3322d238bf6fa659c95ff0
  1. Prev
  2. Next