aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-01-13Merge "remove Exchange2 from core.mk" into mnc-dr1.5-devmarshmallow-dr1.5-devAndy Huang
2016-01-12Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e ↵Zach Jang
am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5 * commit '6facd249d51ffef6afa369b11041ae07733883b8': Updating security patch string to 2016-03-01
2016-01-12Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e ↵Zach Jang
am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 * commit '6c61548bb7e426704760c9351e3211fb45d67dae': Updating security patch string to 2016-03-01
2016-01-12Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e ↵Zach Jang
am: 53e7d9bf7f am: c9da4cce57 * commit 'c9da4cce57d387f52b675d1024459af5e73c6dbc': Updating security patch string to 2016-03-01
2016-01-12Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43eZach Jang
am: 53e7d9bf7f * commit '53e7d9bf7f298c438157dccc5222b7484b083d9e': Updating security patch string to 2016-03-01
2016-01-12Updating security patch string to 2016-03-01 am: c24c6ccd4dZach Jang
am: 293887c43e * commit '293887c43ee5b797f8628f5983f64bf766002009': Updating security patch string to 2016-03-01
2016-01-12Updating security patch string to 2016-03-01Zach Jang
am: c24c6ccd4d * commit 'c24c6ccd4d5de8be010b74b9021b8fdb926e1dad': Updating security patch string to 2016-03-01
2016-01-11Updating security patch string to 2016-03-01Zach Jang
b/26499556 Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
2015-12-09DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: ↵Zach Jang
af970fb308 am: 41846b0063 -s ours am: db4d57a84c am: 02115bf55a am: 4c51cd1a9b * commit '4c51cd1a9b5c41e4092aef7c5fb4cc0364873a2c': DO NOT MERGE - Update security string to 2016-02-01
2015-12-09DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: ↵Zach Jang
af970fb308 am: 41846b0063 -s ours am: db4d57a84c am: 02115bf55a * commit '02115bf55a840790bbbca3c452a85bc97381522a': DO NOT MERGE - Update security string to 2016-02-01
2015-12-09DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: ↵Zach Jang
af970fb308 am: 41846b0063 -s ours am: db4d57a84c * commit 'db4d57a84c8f0f6b51d9b69c2e0ec3ac825270c0': DO NOT MERGE - Update security string to 2016-02-01
2015-12-09DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: ↵Zach Jang
af970fb308 am: 41846b0063 -s ours * commit '41846b00633d3eba58193565c8f6c213006cea5d': DO NOT MERGE - Update security string to 2016-02-01
2015-12-09Update Security String to 2016-02-01 am: f0f73c06e2 am: 5e2b003a11Zach Jang
am: 8b5be4dd4f * commit '8b5be4dd4f50266362f689d4c8f7d20fc25c5baf': Update Security String to 2016-02-01
2015-12-09DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2bZach Jang
am: af970fb308 * commit 'af970fb308dd7914e8dccb56e8ea08d50e92e617': DO NOT MERGE - Update security string to 2016-02-01
2015-12-09Update Security String to 2016-02-01 am: f0f73c06e2Zach Jang
am: 5e2b003a11 * commit '5e2b003a116c8de6bfadf4b74d0cc676e0ed0d76': Update Security String to 2016-02-01
2015-12-09DO NOT MERGE - Update security string to 2016-02-01Zach Jang
am: 929a4abd2b * commit '929a4abd2b777715bc730593aee87643a30706d6': DO NOT MERGE - Update security string to 2016-02-01
2015-12-09Update Security String to 2016-02-01Zach Jang
am: f0f73c06e2 * commit 'f0f73c06e25e17ecf8e06f42c51efac102597f57': Update Security String to 2016-02-01
2015-12-09DO NOT MERGE - Update security string to 2016-02-01Zach Jang
b/26110717 Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
2015-12-09Update Security String to 2016-02-01Zach Jang
b/26110717 Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
2015-12-09remove Exchange2 from core.mkAndy Huang
Change-Id: I962d706d19eef5bbde3abed516d0a674ba50c1c1
2015-11-24Shorten TARGET_BRAND from generic_<arch> to AndroidVince Harron
am: 5806531f92 * commit '5806531f92a3670362ec8dceafd0079d51afbd18': Shorten TARGET_BRAND from generic_<arch> to Android
2015-11-24Shorten TARGET_BRAND from generic_<arch> to AndroidVince Harron
Switching to userdebug emulator images increased ro.build.fingerprint Past the 91 character limit. This should bring the build server builds under this limit. Fixing it for local builds will be a bit more difficult. Bug: 25829506 Change-Id: I7daee3478716adcb860cced1b770a2d00a72f1a2 (cherry picked from commit efbeab78d3581009b3da20991a3a83d733393f45)
2015-11-21Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: ↵Zach Jang
645f200ae8 am: 2cd2a76c64 -s ours am: c7b96cdd5e am: 8909bdfc4a am: a68c55822c * commit 'a68c55822c115db2151b1d155566a06b01756d20': Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: ↵Zach Jang
645f200ae8 am: 2cd2a76c64 -s ours am: c7b96cdd5e am: 8909bdfc4a * commit '8909bdfc4abd8ffc6511c864fe968530abe40b8a': Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: ↵Zach Jang
645f200ae8 am: 2cd2a76c64 -s ours am: c7b96cdd5e * commit 'c7b96cdd5e83ea7c62912bc779e7bc49c59023c7': Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: ↵Zach Jang
645f200ae8 am: 2cd2a76c64 -s ours * commit '2cd2a76c64dead0b057b7e9a1223f67f9a9d2e7f': Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5adZach Jang
am: 645f200ae8 * commit '645f200ae8708414d06618989328dc3e3c84a917': Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21Update Security String to 2016-01-01 to mnc-dev am: 170459f438 am: bcf2866fb1Zach Jang
am: 3ce70dfe46 * commit '3ce70dfe467246c28290f8ca24c1f5319b46142b': Update Security String to 2016-01-01 to mnc-dev
2015-11-21Update Security String to 2016-01-01 - DO NOT MERGEZach Jang
am: 58cdbdc5ad * commit '58cdbdc5ad54f9c26d94860c2d0be712f88a8f07': Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21Update Security String to 2016-01-01 to mnc-dev am: 170459f438Zach Jang
am: bcf2866fb1 * commit 'bcf2866fb1ea50ea31ede70f62b864332f61b980': Update Security String to 2016-01-01 to mnc-dev
2015-11-21Update Security String to 2016-01-01 to mnc-devZach Jang
am: 170459f438 * commit '170459f4385d35dd991549e1b545c376ca8df281': Update Security String to 2016-01-01 to mnc-dev
2015-11-20Update Security String to 2016-01-01 to mnc-devZach Jang
http://b/25819582 Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
2015-11-20Update Security String to 2016-01-01 - DO NOT MERGEZach Jang
http://b/25819582 Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
2015-11-15Revert "Change version back to 6.0" am: 55a149b740Bart Sears
am: 550b317688 * commit '550b317688211118d8f2c50aaa80d2616903807b': Revert "Change version back to 6.0"
2015-11-15Change version back to 6.0 am: 970f203b3dBart Sears
am: 3a37a0cefd * commit '3a37a0cefd7599fa769fd86f7d64d781aaa88be7': Change version back to 6.0
2015-11-15Revert "Change version back to 6.0"Bart Sears
am: 55a149b740 * commit '55a149b74064b799efe9c69211a511725cb9925b': Revert "Change version back to 6.0"
2015-11-15Change version back to 6.0Bart Sears
am: 970f203b3d * commit '970f203b3d3f17b778749c3ce47eb6b922aa606c': Change version back to 6.0
2015-11-15Revert "Change version back to 6.0"Bart Sears
This reverts commit 970f203b3d3f17b778749c3ce47eb6b922aa606c. Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
2015-11-14Change version back to 6.0Bart Sears
Temporarily set the version back to 6.0 and security patch to 2015-11-01. Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
2015-11-11Switch emulator to generate userdebug images by defaultVince Harron
am: ba740ff57f * commit 'ba740ff57fd314d0ad649c252841ab834e96fdaa': Switch emulator to generate userdebug images by default
2015-11-11Switch emulator to generate userdebug images by defaultVince Harron
This is primarily to avoid using the unsupported JIT on Android-M It will increase app install times significantly because the app will be compiled at install time. OTOH, It should improve application performance dramatically. Change-Id: Id1d637ec561db177fd52e4c111f4def2a1b45543 (cherry picked from commit 08787d747d71d7ff3f13d2275d937faefc6d7777)
2015-11-08Let qemu_props service set system properties in ro.emu and ro.emulatorGriff Hazen
am: 20ed978ada * commit '20ed978ada07690b7ca6d643f6c8869e656ccff7': Let qemu_props service set system properties in ro.emu and ro.emulator
2015-11-07Let qemu_props service set system properties in ro.emu and ro.emulatorGriff Hazen
These boot properties are used by android wear emulator to configure round and chin shaped devices. Bug: 23324757 Change-Id: I812da02d771bba0ffc63b14459c7de7cbdeed142
2015-10-27Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a am: ↵Zach Jang
dfd3524f7b am: eca2b655e5 * commit 'eca2b655e5a57f0a13c55d815f6b18d8d03160fb': Update security string to 2015-12-01
2015-10-27Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4aZach Jang
am: dfd3524f7b * commit 'dfd3524f7b1fb2f0346eee7fa0dc42e8888f68aa': Update security string to 2015-12-01
2015-10-27Merge "Update security string to 2015-12-01" into mnc-devmarshmallow-mr1-devZach Jang
am: 54cb940c4a * commit '54cb940c4a07701212e96f77ee4a89493b0f251b': Update security string to 2015-12-01
2015-10-27Merge "Update security string to 2015-12-01" into mnc-devZach Jang
2015-10-27Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: ↵Zach Jang
cc9ac27157 am: fe64ce145e -s ours am: 0e8cf97670 am: 07e2c19536 am: a3b35dec78 * commit 'a3b35dec78b8afe7e29e3d6a0fc7524b5fd846a2': Update security string to 2015-12-01 - DO NOT MERGE
2015-10-26Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: ↵Zach Jang
cc9ac27157 am: fe64ce145e -s ours am: 0e8cf97670 am: 07e2c19536 * commit '07e2c195367119faa4645d3f9f0dcb1c6aba7396': Update security string to 2015-12-01 - DO NOT MERGE
2015-10-26Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: ↵Zach Jang
cc9ac27157 am: fe64ce145e -s ours am: 0e8cf97670 * commit '0e8cf97670c0b0a59d326507296829fe1bc01230': Update security string to 2015-12-01 - DO NOT MERGE