Dirk Dougherty
bc93334be2
Doc change: redirect accessibility best practices to new location.
...
Change-Id: I4c4d96ed07ecd4640f98d3c5a719cb24f48ab94f
2012-09-10 12:02:50 -07:00
Brett Chabot
7bfaffd635
am 08e5a8ae: Merge "Coverage and unbundling changes for runtest." into jb-mr1-dev
...
* commit '08e5a8ae69a8d6f9d50cc84768c85a73ddfa748f':
Coverage and unbundling changes for runtest.
2012-09-10 07:59:59 -07:00
Brett Chabot
08e5a8ae69
Merge "Coverage and unbundling changes for runtest." into jb-mr1-dev
2012-09-10 07:58:47 -07:00
The Android Automerger
15d4e75c4d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-10 06:59:11 -07:00
Dianne Hackborn
63e79a6253
am bd783a0e: New API demo for nested fragments in support lib.
...
* commit 'bd783a0e87ea6c9d56e24c313e251d993bf04d3c':
New API demo for nested fragments in support lib.
2012-09-09 14:47:11 -07:00
Dianne Hackborn
bd783a0e87
New API demo for nested fragments in support lib.
...
Also some cleanup of other demos.
Change-Id: I8c4265218c87e490718c9c908803fc09303873a6
2012-09-09 14:41:24 -07:00
The Android Automerger
4d01f849ef
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-09 06:59:45 -07:00
Dianne Hackborn
6852ac7430
am 077c59a0: Track multi-user change.
...
* commit '077c59a0b9351cb0a6fe0098de3b9591ddaaf4f0':
Track multi-user change.
2012-09-07 14:14:04 -07:00
Dianne Hackborn
077c59a0b9
Track multi-user change.
...
Change-Id: I0b45ec880f6149fba5d2d83c014e1e71a6524b99
2012-09-07 13:08:27 -07:00
Andrew Hsieh
bc9d176568
am c29e27ad: am 17a180c9: am a295480f: am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
...
* commit 'c29e27ad4194ced54c54a0e021593505f3dda305':
Rewrite ARM crtbegin* as C files
2012-09-06 18:38:23 -07:00
Andrew Hsieh
c29e27ad41
am 17a180c9: am a295480f: am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
...
* commit '17a180c959e0e0165472a6bd47d2443478a6eb27':
Rewrite ARM crtbegin* as C files
2012-09-06 18:36:12 -07:00
Andrew Hsieh
17a180c959
am a295480f: am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
...
* commit 'a295480fa627e4f0fac0a3a5f992b9e69b4fc062':
Rewrite ARM crtbegin* as C files
2012-09-06 18:33:46 -07:00
Andrew Hsieh
a295480fa6
am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
...
* commit '4102c6f241153cb04e2fad7900ffbc07841c1381':
Rewrite ARM crtbegin* as C files
2012-09-06 18:31:47 -07:00
Andrew Hsieh
4102c6f241
am b833605a: Merge "Rewrite ARM crtbegin* as C files"
...
* commit 'b833605a2bf5c27ff57cf5508fc58bca351c2470':
Rewrite ARM crtbegin* as C files
2012-09-06 18:30:03 -07:00
Andrew Hsieh
b833605a2b
Merge "Rewrite ARM crtbegin* as C files"
2012-09-06 18:14:38 -07:00
Dianne Hackborn
99a9e9bdba
am 5bed4414: am 51f241cb: Merge "API demo for nesting fragments." into jb-mr1-dev
...
* commit '5bed44144487cd4e3432872e8e88a550df506d15':
API demo for nesting fragments.
2012-09-06 11:50:38 -07:00
Dianne Hackborn
5bed441444
am 51f241cb: Merge "API demo for nesting fragments." into jb-mr1-dev
...
* commit '51f241cbee24727175f5ef369e312d21363f6272':
API demo for nesting fragments.
2012-09-06 11:47:25 -07:00
Eino-Ville Talvala
72121a4676
am 87ae2ac8: am cfd8132a: Merge "EmulatedFakeCamera2: Split AE/AWB mode and lock" into jb-mr1-dev
...
* commit '87ae2ac8653b6272302510dbb8846286f9c4f43a':
EmulatedFakeCamera2: Split AE/AWB mode and lock
2012-09-06 11:46:55 -07:00
Eino-Ville Talvala
87ae2ac865
am cfd8132a: Merge "EmulatedFakeCamera2: Split AE/AWB mode and lock" into jb-mr1-dev
...
* commit 'cfd8132af00e517a5442a5a077354dac40b1aa21':
EmulatedFakeCamera2: Split AE/AWB mode and lock
2012-09-06 11:45:00 -07:00
Dianne Hackborn
51f241cbee
Merge "API demo for nesting fragments." into jb-mr1-dev
2012-09-06 11:44:22 -07:00
Eino-Ville Talvala
cfd8132af0
Merge "EmulatedFakeCamera2: Split AE/AWB mode and lock" into jb-mr1-dev
2012-09-06 11:42:46 -07:00
Dianne Hackborn
f3f7c5f775
API demo for nesting fragments.
...
Change-Id: I7f20e4f00cf68c78c578ae620a95de7fa97f0761
2012-09-06 11:39:30 -07:00
The Android Open Source Project
47e11611ff
am 9709d7fc: (-s ours) am 310bc879: am 51535bf8: (-s ours) Reconcile with jb-release - do not merge
...
* commit '9709d7fc11302ea17cfc5905395288c360099971':
2012-09-06 09:19:33 -07:00
The Android Open Source Project
9709d7fc11
am 310bc879: am 51535bf8: (-s ours) Reconcile with jb-release - do not merge
...
* commit '310bc879f95291339f1efe34ddc8f7fa2ba8fdf9':
2012-09-06 09:13:48 -07:00
The Android Open Source Project
89c4631e56
am b74cdde6: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'b74cdde67616e214d6bb90212e7dcb62b7b28361':
2012-09-06 09:12:03 -07:00
The Android Open Source Project
310bc879f9
am 51535bf8: (-s ours) Reconcile with jb-release - do not merge
...
* commit '51535bf8ad7d950e05df7c16e4e6a35effc29e83':
2012-09-06 09:11:31 -07:00
The Android Open Source Project
51535bf8ad
Reconcile with jb-release - do not merge
...
Change-Id: I2d47692562ca20d2e2e356ae569a2dbf1caeef0c
2012-09-06 08:08:14 -07:00
The Android Open Source Project
b74cdde676
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I17d2fef9d303c34015d889816c369a2e5899e65d
2012-09-06 07:53:00 -07:00
Andrew Hsieh
d0b834c7ad
Rewrite ARM crtbegin* as C files
...
This is port of related CLs:
9d40326830c2bd407427889c554adeb915ee6b4a
f3cfcd869ded41d25c1f4f4e48e7c374a64f9583
Summary: By placing __PREINIT_ARRAY__, __INIT_ARRAY__, __FINI_ARRAY__
and __CTOR_LIST__ on stack, this change allows PIC w/o relying on text
relocations.
Change-Id: I02a1b496b16aba692f4f9fa998a71efd943689fd
2012-09-06 15:27:56 +08:00
The Android Automerger
52f99e55cc
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-05 06:33:32 -07:00
Eino-Ville Talvala
7a56f99e74
am dfe8cfa1: am 7002083f: Merge "Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""" into jb-mr1-dev
...
* commit 'dfe8cfa1539d7a7f088554f3d8fae10117767b8f':
Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""
2012-09-04 16:26:30 -07:00
Eino-Ville Talvala
0562785291
am ea7a061c: am f8ddf2e5: Merge "Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""" into jb-mr1-dev
...
* commit 'ea7a061c9cec052765a2ecc0366f55249f36bc38':
Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""
2012-09-04 16:26:28 -07:00
Eino-Ville Talvala
dfe8cfa153
am 7002083f: Merge "Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""" into jb-mr1-dev
...
* commit '7002083f083d1139a30ac530ce8b914e6c5e91ef':
Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""
2012-09-04 16:24:39 -07:00
Eino-Ville Talvala
ea7a061c9c
am f8ddf2e5: Merge "Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""" into jb-mr1-dev
...
* commit 'f8ddf2e53896c46be4171d05579a081a519c5b52':
Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""
2012-09-04 16:24:38 -07:00
Eino-Ville Talvala
7002083f08
Merge "Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""" into jb-mr1-dev
2012-09-04 16:22:12 -07:00
Eino-Ville Talvala
f8ddf2e538
Merge "Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""" into jb-mr1-dev
2012-09-04 16:22:12 -07:00
Eino-Ville Talvala
f11b793ffb
Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""
...
Missing project ready to go.
This reverts commit 75832395dd
Change-Id: I48f6dee11248de5a12b66bd7fbc724c82517fe3a
2012-09-04 14:21:30 -07:00
Eino-Ville Talvala
18f28c0c21
Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""
...
Missing project ready to go.
This reverts commit 9642da5102
Change-Id: I08a43e9cdcb06bd6b74fd08809bbaf801c2eb44f
2012-09-04 14:21:19 -07:00
Eino-Ville Talvala
7e849cfa85
am 7e2ae6af: am f0063b29: Merge "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."" into jb-mr1-dev
...
* commit '7e2ae6af7412629df217407c81e8fe757e6c9fd5':
Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."
2012-09-04 12:32:26 -07:00
Eino-Ville Talvala
a9345e02ba
am 3cb39916: am 7b8420e2: Merge "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"" into jb-mr1-dev
...
* commit '3cb39916c1b4e36d7ddce2b5a504ce0c744074cf':
Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"
2012-09-04 12:32:25 -07:00
Eino-Ville Talvala
7f34893c98
am 9468d306: am c07123b1: Merge "EmulatedFakeCamera2: Add precapture trigger and reprocess support" into jb-mr1-dev
...
* commit '9468d306eea2749831e2630ec4261a8b1b3117c2':
EmulatedFakeCamera2: Add precapture trigger and reprocess support
2012-09-04 12:29:54 -07:00
Eino-Ville Talvala
7e2ae6af74
am f0063b29: Merge "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."" into jb-mr1-dev
...
* commit 'f0063b298b078df61d7b80bfdbb9ea28515ed615':
Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."
2012-09-04 12:29:29 -07:00
Eino-Ville Talvala
3cb39916c1
am 7b8420e2: Merge "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"" into jb-mr1-dev
...
* commit '7b8420e2ab2759eaa44921285a76e3812e76644b':
Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"
2012-09-04 12:29:27 -07:00
Eino-Ville Talvala
f0063b298b
Merge "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."" into jb-mr1-dev
2012-09-04 12:28:05 -07:00
Eino-Ville Talvala
9468d306ee
am c07123b1: Merge "EmulatedFakeCamera2: Add precapture trigger and reprocess support" into jb-mr1-dev
...
* commit 'c07123b1efa5dbc1ece200ed951700bb27276294':
EmulatedFakeCamera2: Add precapture trigger and reprocess support
2012-09-04 12:27:59 -07:00
Eino-Ville Talvala
7b8420e2ab
Merge "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"" into jb-mr1-dev
2012-09-04 12:27:56 -07:00
Eino-Ville Talvala
9642da5102
Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."
...
More dependent projects than I realized
This reverts commit a84522d2f3
Change-Id: Ifb50c94a2a5dfa91573f07695d8f3bfcadc79742
2012-09-04 12:27:04 -07:00
Eino-Ville Talvala
75832395dd
Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"
...
More dependent projects than I realized.
This reverts commit 4573a7194d
Change-Id: I53cfbc5cf5ef4436f5fa0c8b1ceb6296797e32fe
2012-09-04 12:26:21 -07:00
Eino-Ville Talvala
c07123b1ef
Merge "EmulatedFakeCamera2: Add precapture trigger and reprocess support" into jb-mr1-dev
2012-09-04 12:25:18 -07:00
Eino-Ville Talvala
50d68de6af
am 28125f96: am 4604e30d: Merge "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage." into jb-mr1-dev
...
* commit '28125f96a830e17e02d1a7435b098486e6e42a02':
Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.
2012-09-04 12:11:53 -07:00