Merge commit '12313686fb731e79224067ed13749c2c4dae4256' into eclair-mr2-plus-aosp
* commit '12313686fb731e79224067ed13749c2c4dae4256':
doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-mr2
* commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259' into eclair
* commit 'c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259':
doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'c41d251615431a36fc3b664d2bdbe749702a11d9'
* commit 'c41d251615431a36fc3b664d2bdbe749702a11d9':
docs: change javascript so that SDK docs that are not
Merge commit '11cb880f1ef5296cb9eb1aff478808248eb7fe6b' into eclair-mr2-plus-aosp
* commit '11cb880f1ef5296cb9eb1aff478808248eb7fe6b':
docs: change javascript so that SDK docs that are not
Merge commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9' into eclair-mr2
* commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
docs: change javascript so that SDK docs that are not
Merge commit '0d8872e6f2462a947c1543b88a7a353072b808e3' into eclair
* commit '0d8872e6f2462a947c1543b88a7a353072b808e3':
docs: change javascript so that SDK docs that are not
Merge commit '7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db' into eclair-mr2-plus-aosp
* commit '7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db':
docs: add eclair logo for homepage
Merge commit 'f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-mr2
* commit 'f963ee638c974942ad99ff4ca9ec985d489e5388':
docs: add eclair logo for homepage
Merge commit '60dba89451e4ee489720436a9a3f3de4823da7d2' into eclair
* commit '60dba89451e4ee489720436a9a3f3de4823da7d2':
docs: add eclair logo for homepage
Merge commit '5f5f08dd226a153ff4c73c0b1918bd5cc1afcffb' into eclair-mr2-plus-aosp
* commit '5f5f08dd226a153ff4c73c0b1918bd5cc1afcffb':
stop adding ota-rel-keys tag when signing
In particular don't put the symbol indices from included .a files into
them. I didn't change the equivalent device rule ala the "if it ain't
broke" rule of thumb.
Change-Id: I064ac356a6f48f93fca2cd08a8408ca835f8f9a4
Merge commit '21e91f357a45069eaa55542dc9f46d1293d1c21c'
* commit '21e91f357a45069eaa55542dc9f46d1293d1c21c':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Merge commit '355670b98584210502f96fe0446a854f07026c28' into eclair-mr2-plus-aosp
* commit '355670b98584210502f96fe0446a854f07026c28':
Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb' into eclair-mr2-plus-aosp
* commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Merge commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-mr2
* commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924':
Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-mr2
* commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Merge commit '7d3d31d5642bcae97c44bbdacafdced1e8e1c034'
* commit '7d3d31d5642bcae97c44bbdacafdced1e8e1c034':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
Merge commit 'b04f8cdccf01132c7c14df1fed1f39c9dbb752c6' into eclair-mr2-plus-aosp
* commit 'b04f8cdccf01132c7c14df1fed1f39c9dbb752c6':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
Merge commit 'decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-mr2
* commit 'decdbd7956c34895f73001cfa2018a27c8702ad0':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
