summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am c7797bb3: am 8f9849a0: Merge "no-op"Jean-Baptiste Queru2011-02-100-0/+0
|\ | | | | | | | | * commit 'c7797bb334e071e9d932a37b3d8f3870bafd9176': no-op
| * am 8f9849a0: Merge "no-op"Jean-Baptiste Queru2011-02-100-0/+0
| |\ | | | | | | | | | | | | * commit '8f9849a037c901ea3b1e7a1d7d43f56728abea40': no-op
| | * Merge "no-op"Jean-Baptiste Queru2011-02-100-0/+0
| | |\
| | | * no-opJean-Baptiste Queru2011-02-100-0/+0
| | |/ | | | | | | | | | Change-Id: Ifd90e66fe63d429f9998a36f72553e2aacf3fc7c
* | | am d239c1bd: Fix dependency of prebuilt target non-static Java libraries.Ying Wang2011-02-081-3/+13
|\ \ \ | | | | | | | | | | | | | | | | * commit 'd239c1bd1bef3067acebcd9d87a7be68d6eb4b98': Fix dependency of prebuilt target non-static Java libraries.
| * | | Fix dependency of prebuilt target non-static Java libraries.Ying Wang2011-02-081-3/+13
| | | | | | | | | | | | | | | | Change-Id: Ib9a01e1d0cf1eed57de0dc7706ee12125212ba67
* | | | am 4c8ae40a: docs: remove preliminary watermark from docsScott Main2011-02-071-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4c8ae40abba83921bd98eb6636b5e3d753bbd183': docs: remove preliminary watermark from docs
| * | | docs: remove preliminary watermark from docsScott Main2011-02-071-2/+2
| | | | | | | | | | | | | | | | Change-Id: I452596cdc5b87effdb958ff963d9aa80ebec5d37
* | | | am 61281638: am 886e5aa7: Merge "fix api level filtering script to compare ↵Scott Main2011-02-040-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | integers, not strings" into gingerbread * commit '612816385a5c6ca2bd54d027617c42c34338682f': fix api level filtering script to compare integers, not strings
| * | | am 886e5aa7: Merge "fix api level filtering script to compare integers, not ↵Scott Main2011-02-041-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strings" into gingerbread * commit '886e5aa742c1667de3ca5b628bf6865948ef4513': fix api level filtering script to compare integers, not strings
| | * \ \ Merge "fix api level filtering script to compare integers, not strings" into ↵Scott Main2011-02-041-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | fix api level filtering script to compare integers, not stringsScott Main2011-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4d0d6c40dd5c1f8470567ef30f0f7500b442fbe5
* | | | | | am 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps.jar from the ↵Raphael2011-02-040-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | google_apis addon." from HC. Do not merge. * commit '3e01b483708d0fc3766fa4adff2ae8b354de75dc': merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
| * | | | | am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from ↵Raphael2011-02-041-0/+13
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HC. Do not merge. * commit '843c6e2530a0783ae1a5a4758cb5e76ad975ae72': merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
| | * | | | merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not ↵Raphael2011-02-041-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge. Depends on change 8252cdea from development to get the verbose/quiet flag for mkstub. Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c
* | | | | | am 4b311bc9: Merge "fix api level filtering script to compare integers, not ↵Scott Main2011-02-041-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | strings" into honeycomb * commit '4b311bc91a7851b204c63e678b0213504125d3aa': fix api level filtering script to compare integers, not strings
| * | | | | Merge "fix api level filtering script to compare integers, not strings" into ↵Scott Main2011-02-041-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | honeycomb
| | * | | | | fix api level filtering script to compare integers, not stringsScott Main2011-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f0e44ec2bf0833a0d547a3795ee31ee0dc69d8a
* | | | | | | am 8cf6d9e3: Merge "tweak header css for more distinction" into honeycombScott Main2011-02-041-8/+16
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8cf6d9e3ae1f7a18c49121c578fe1f5f05371342': tweak header css for more distinction
| * | | | | | Merge "tweak header css for more distinction" into honeycombScott Main2011-02-041-8/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | tweak header css for more distinctionScott Main2011-02-031-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d63b7587917bfde3df5547b5648610d86083d6a
* | | | | | | am 30e07075: SDK: stub the maps.jar from the google_apis addon.Raphael2011-02-041-0/+13
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '30e0707531268343e11dfeb51f28ccdacd7f9875': SDK: stub the maps.jar from the google_apis addon.
| * | | | | | SDK: stub the maps.jar from the google_apis addon.Raphael2011-02-031-0/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depends on change 8252cdea from development to get the verbose/quiet flag for mkstub. Change-Id: I5f4e766613576828147c97be8d38e97fe1035672
* | | | | | am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" ↵Raphael Moll2011-02-031-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | under Windows" * commit 'ed19189877a3a380074e8e76969ef23689cec8fd': SDK: Enable "make sdk/common" under Windows
| * | | | | am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"Raphael Moll2011-02-031-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a15717c9905e32f2724645e3734567c40d8d3eb0': SDK: Enable "make sdk/common" under Windows
| | * \ \ \ \ am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"Raphael Moll2011-02-031-0/+1
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | * commit '6b7b53cb36bda3b2aa1de94654cd73785d67c267': SDK: Enable "make sdk/common" under Windows
| | | * | | | Merge "SDK: Enable "make sdk/common" under Windows"Raphael Moll2011-02-031-0/+1
| | | |\ \ \ \
| | | | * | | | SDK: Enable "make sdk/common" under WindowsRaphael Moll2011-02-021-0/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
* | | | | | | am 79e1d2cf: am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."Raphael2011-02-030-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '79e1d2cf99754f81137c0f390d0e1fd898e52277': SDK: Strip llvm-rs-cc in SDK.
| * | | | | | am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."Raphael2011-02-031-1/+10
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '6b6e8114810bb26a64e1d8d9814fdfadb90c3848': SDK: Strip llvm-rs-cc in SDK.
| | * | | | | am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."Raphael2011-02-031-1/+10
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '4167b2bae58b445cfaf15291a7aa6b0ccd025596': SDK: Strip llvm-rs-cc in SDK.
| | | * | | | Merge "SDK: Strip llvm-rs-cc in SDK."Raphael2011-02-021-1/+10
| | | |\ \ \ \
| | | | * | | | SDK: Strip llvm-rs-cc in SDK.Raphael2011-02-021-1/+10
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK Bug: 3394374 Change-Id: I728112795ad40a31a1b4c476e043ef213241c617
* | | | | | | am 678c7ac9: (-s ours) am d7798a7e: fix TINY ANDROID yet again...Brian Swetland2011-02-020-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '678c7ac997ba5daf09664d3e9b26f1c4a493b99e': fix TINY ANDROID yet again...
| * | | | | | am d7798a7e: fix TINY ANDROID yet again...Brian Swetland2011-02-021-0/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'd7798a7e1b3241c49d7c8325cf14ac608350b719': fix TINY ANDROID yet again...
| | * | | | | fix TINY ANDROID yet again...Brian Swetland2011-02-021-0/+2
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
* | | | | | am 7a6a9c35: SDK: Strip llvm-rs-cc in SDK.Raphael2011-02-021-1/+10
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * commit '7a6a9c3528d997a1cb3a03eca3c0c11b14792449': SDK: Strip llvm-rs-cc in SDK.
| * | | | | SDK: Strip llvm-rs-cc in SDK.Raphael2011-02-021-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK Bug: 3394374 Change-Id: I2b0e46d9f94d488611bd79193f4a11cc0f36be51
* | | | | | Merge commit '1eda8628' into honeycomb-plus-aospEd Heyl2011-02-020-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I07948d5d76f4a25ae93ebd6c7ba0d520ef5b61c0
| * | | | | set ID back to honeycomb (please do not merge)Ed Heyl2011-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I469ccbb2a556d3aeaedb9d0a89bda1d77aef6b90
* | | | | | am 463694a4: (-s ours) am 0fe9974c: cherrypick Change-Id: ↵Scott Main2011-02-010-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb * commit '463694a4f54de3d16de21b7aa9a7030b73fbd2e5': cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
| * | | | | am 0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 ↵Scott Main2011-02-011-9/+11
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | backport some style changes for notes from master to gb * commit '0fe9974c38e41a2aa386d5744d1a75d8bd26b1bc': cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
| | * | | | cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3Scott Main2011-02-011-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backport some style changes for notes from master to gb Change-Id: I4a7c6cfcadade5d90069ecab1edc694cb333430e
* | | | | | am 9c0f3e35: Build only userdata.img.Ying Wang2011-02-011-0/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit '9c0f3e355194d1c43bf70f35f953d6a2babc815a': Build only userdata.img.
| * | | | | Build only userdata.img.Ying Wang2011-02-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use build command like: $make -j16 showcommands userdataimage dist TARGET_PRODUCT=trygon_with_data_preloaded TARGET_BUILD_VARIANT=user Change-Id: I964490e03090c3696d1595c92363273e35cfaed7
* | | | | | am e104f773: Merge "docs: modify style for toggle stuff so text isn\'t blue" ↵Scott Main2011-01-311-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb * commit 'e104f7731807c28d6c23eef7b88e1f53e1f7484a': docs: modify style for toggle stuff so text isn't blue
| * | | | | Merge "docs: modify style for toggle stuff so text isn't blue" into honeycombScott Main2011-01-311-0/+1
| |\ \ \ \ \
| | * | | | | docs: modify style for toggle stuff so text isn't blueScott Main2011-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief363bf67d4e0c0fc1a8e79d4b02474c475c88ac
* | | | | | | am e29ef594: (-s ours) Merge from open-source masterJean-Baptiste Queru2011-01-310-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e29ef594e6836cdeee09de51f3a4b9af11cdabff': partial build fix partial build fix
| * | | | | | Merge from open-source masterJean-Baptiste Queru2011-01-311-0/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2