summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "arm: turn on -Wl,--fatal-warnings"Nick Kralevich2012-10-161-0/+1
|\
| * arm: turn on -Wl,--fatal-warningsNick Kralevich2012-10-151-0/+1
* | Merge "add multiple key support to signapk"Doug Zongker2012-10-161-33/+67
|\ \
| * | add multiple key support to signapkDoug Zongker2012-10-161-33/+67
| |/
* | Add BOARD_DONT_BUILD_USERDATA_IMGYing Wang2012-10-151-0/+3
|/
* am 165c67aa: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release -...The Android Open Source Project2012-10-150-0/+0
|\
| *-. Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-150-0/+0
| |\ \
| | | * JOP15The Android Automerger2012-10-151-13/+3
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-150-0/+0
| | | |\
| | | | * JOP14The Android Automerger2012-10-141-13/+3
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-140-0/+0
| | | | |\ | | | |/ /
| | | | * JOP13The Android Automerger2012-10-131-13/+3
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-130-0/+0
| | | | |\ | | | |/ /
| | | | * JOP12DThe Android Automerger2012-10-131-13/+3
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-130-0/+0
| | | | |\ | | | |/ /
| | | | * JOP12CThe Android Automerger2012-10-121-13/+3
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | | |\
| | | | | * JOP12BThe Android Automerger2012-10-121-13/+3
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | | | |\ | | | | |/ /
| | | | | * JOP12The Android Automerger2012-10-121-13/+3
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | | | |\ | | | | |/ /
| | | | | * JOP11BThe Android Automerger2012-10-111-13/+3
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | | | |\
| | * | | | | JVP12CThe Android Automerger2012-10-121-13/+3
| | * | | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | JVP12The Android Automerger2012-10-121-13/+3
| | | * | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | JVP11The Android Automerger2012-10-111-13/+3
| | | * | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | |\ \ \ \
* | | | \ \ \ \ am ea718cdb: (-s ours) am 0f23979f: am 18daa175: Merge "DO NOT MERGE: better ...Guang Zhu2012-10-120-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 0f23979f: am 18daa175: Merge "DO NOT MERGE: better late than never: fix bu...Guang Zhu2012-10-121-1/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ am 18daa175: Merge "DO NOT MERGE: better late than never: fix build id for JB...Guang Zhu2012-10-121-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb...Guang Zhu2012-10-121-1/+1
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | DO NOT MERGE: better late than never: fix build id for JB MR1Guang Zhu2012-10-091-1/+1
* | | | | | | | | am 57dfd515: am 6a44471c: am abc9d6f2: Merge "Delete the unused LOCAL_POST_PR...Ying Wang2012-10-123-3/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 6a44471c: am abc9d6f2: Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND...Ying Wang2012-10-123-3/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am abc9d6f2: Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr...Ying Wang2012-10-113-3/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-devYing Wang2012-10-113-3/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | Delete the unused LOCAL_POST_PROCESS_COMMAND.Ying Wang2012-10-113-3/+0
| | | | | |_|_|/ / | | | | |/| | | |
* | | | | | | | | am bd31f173: am f9f6084a: Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java...Joe Onorato2012-10-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am f9f6084a: Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.Joe Onorato2012-10-121-2/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.Joe Onorato2012-10-111-2/+4
* | | | | | | | | am d2637573: resolved conflicts for merge of ed38fe6f to jb-mr1-dev-plus-aospStephen Hines2012-10-122-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | resolved conflicts for merge of ed38fe6f to jb-mr1-dev-plus-aospStephen Hines2012-10-112-3/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 0a0cfe95: Merge "Add support for building Filterscript files." into jb-mr1...Stephen Hines2012-10-112-3/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Add support for building Filterscript files." into jb-mr1-devStephen Hines2012-10-112-3/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | Add support for building Filterscript files.Stephen Hines2012-10-112-3/+4
* | | | | | | | | | am 9f81546a: am fc8cec68: am afc782da: am 77b10b6a: am e37b7a52: am 8f20607c:...Dirk Dougherty2012-10-112-4/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am fc8cec68: am afc782da: am 77b10b6a: am e37b7a52: am 8f20607c: Doc change: ...Dirk Dougherty2012-10-112-4/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am afc782da: am 77b10b6a: am e37b7a52: am 8f20607c: Doc change: add new items...Dirk Dougherty2012-10-112-4/+6
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /