9f42af5bbc
resolved conflicts for merge of a8df6091 to master
...
Change-Id: I2d088c09738b34f72c2efa030304fca28ad0e791
2012-07-23 19:49:48 -07:00
a8df6091fe
am 28437aac: Add LOCAL_SOURCE_FILES_ALL_GENERATED support
...
* commit '28437aac999eb04d1698d9a6de87a25b5b772da6':
Add LOCAL_SOURCE_FILES_ALL_GENERATED support
2012-07-23 10:32:54 -07:00
28437aac99
Add LOCAL_SOURCE_FILES_ALL_GENERATED support
...
Set "LOCAL_SOURCE_FILES_ALL_GENERATED := true" if you want to build a
Java library from only generated source files, without any static
source files. Previously this is not allowed.
This is needed by building api stub libraries, which have only source
files of generated stub files.
Bug: 6814443
Change-Id: Idb2ae9c71a473b796154a03ef07a3403461c4f3c
2012-07-19 14:38:43 -07:00
74aa3e49c4
am a24cd5eb: am b72b7b84: Merge "docs: further specify design docs\' list styles to fix uls appearing like ols" into jb-dev
...
* commit 'a24cd5ebf0476c003fa97acb8eedbc9939166bca':
docs: further specify design docs' list styles to fix uls appearing like ols
2012-07-19 11:14:58 -07:00
a24cd5ebf0
am b72b7b84: Merge "docs: further specify design docs\' list styles to fix uls appearing like ols" into jb-dev
...
* commit 'b72b7b84b6c0c3a59da6f34531b362782090cabf':
docs: further specify design docs' list styles to fix uls appearing like ols
2012-07-19 11:13:41 -07:00
b72b7b84b6
Merge "docs: further specify design docs' list styles to fix uls appearing like ols" into jb-dev
2012-07-19 11:03:42 -07:00
b9ae92b401
docs: further specify design docs' list styles to fix uls appearing like ols
...
Change-Id: I203daeafb390532e34687338d5c3d4a307ba680f
2012-07-19 11:01:27 -07:00
39a7a7d9a8
am 2e5ae987: Reconcile with jb-mr0-release jb-release
...
* commit '2e5ae9873c4f62f90342cd042eff457c7e1103f0':
JZO18
JZO17
JRO03H
JRO03G
JRO03F
JRO03E
JRO03D
JZO11
JZO10
2012-07-19 08:52:00 -07:00
2e5ae9873c
Reconcile with jb-mr0-release jb-release
...
Change-Id: Id8ba9e1858f97ba17d9f9b9080c0e18c0bebfa7b
2012-07-19 08:35:48 -07:00
bdd2ce0061
JZO18
2012-07-18 21:45:08 -07:00
63b3ed66e2
merge in jb-mr0-release history after reset to jb-dev
2012-07-18 21:44:37 -07:00
1a69876fb3
am 3fae8d4e: am 71b28a60: Merge "docs: add check in hash-change callback to be sure we\'re only dealing with hash-tags that are search queries. bug: 6843654" into jb-dev
...
* commit '3fae8d4e5685e604cc1dcc3c72745d6b521cfdc1':
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug: 6843654
2012-07-18 20:17:48 -07:00
0a798c2097
am 57267e56: am 55163c88: Doc change: add links to the More menu.
...
* commit '57267e567f011d9db838b1a46be1290e563d6f77':
Doc change: add links to the More menu.
2012-07-18 20:17:47 -07:00
3fae8d4e56
am 71b28a60: Merge "docs: add check in hash-change callback to be sure we\'re only dealing with hash-tags that are search queries. bug: 6843654" into jb-dev
...
* commit '71b28a600e52922a7a18b990f256b2fa104d32e8':
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug: 6843654
2012-07-18 20:14:58 -07:00
57267e567f
am 55163c88: Doc change: add links to the More menu.
...
* commit '55163c882e8d97d48f58f8ac86c394ce07548d8c':
Doc change: add links to the More menu.
2012-07-18 20:14:03 -07:00
71b28a600e
Merge "docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug: 6843654" into jb-dev
2012-07-18 16:59:41 -07:00
7f527b3f44
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries.
...
bug: 6843654
Change-Id: I5fee7426d8ad404a5f03f37297fe72009df30de7
2012-07-18 16:58:29 -07:00
55163c882e
Doc change: add links to the More menu.
...
Change-Id: I77e848f86278781b0a44eb672ea711e00352fde5
2012-07-18 16:18:25 -07:00
6fe6c3c22e
pdk: add telephony-common and mms-common
...
Factory test apps may need to compile against telephony-common and
mms-common, include the jars in the pdk platform.zip.
Change-Id: Ic3533ec42115150b94298f15acd877ef61c6660c
2012-07-18 16:06:19 -07:00
67f570576d
am e09cf926: am 1d62fa80: docs: bring back min-height for nav-x for proper height of secondary tabs
...
* commit 'e09cf926325c78b4c2885df83003d1e1c812f94c':
docs: bring back min-height for nav-x for proper height of secondary tabs
2012-07-17 14:11:53 -07:00
1ee9a46ccf
am e84d651d: (-s ours) am c4e790dc: (-s ours) Create telephony-common and mms-common - DO NOT MERGE
...
* commit 'e84d651df1d8e1e5ab951719b997ee65345b363d':
Create telephony-common and mms-common - DO NOT MERGE
2012-07-17 14:08:45 -07:00
e09cf92632
am 1d62fa80: docs: bring back min-height for nav-x for proper height of secondary tabs
...
* commit '1d62fa807e1ac2c4f9ad8f31f34809ec97e975ed':
docs: bring back min-height for nav-x for proper height of secondary tabs
2012-07-17 13:22:25 -07:00
1d62fa807e
docs: bring back min-height for nav-x for proper height of secondary tabs
...
Change-Id: I865195b9fde9ec64fbe2c083c0d3617a55b54a0f
2012-07-17 13:15:12 -07:00
c14ec30c43
JZO17
2012-07-17 12:34:10 -07:00
e84d651df1
am c4e790dc: (-s ours) Create telephony-common and mms-common - DO NOT MERGE
...
* commit 'c4e790dc6474566799012728f9e67f5d794975b4':
Create telephony-common and mms-common - DO NOT MERGE
2012-07-17 12:33:21 -07:00
5bcd6b4be9
merge in jb-mr0-release history after reset to jb-dev
2012-07-17 12:29:00 -07:00
516c242b31
JRO03H
2012-07-17 12:27:31 -07:00
c4e790dc64
Create telephony-common and mms-common - DO NOT MERGE
...
These have been created to reduce the size and complexity
of frameworks/base.
mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms
telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony
Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
2012-07-17 12:22:58 -07:00
34cf20b166
Merge "add TestingCamera to mini for generic PDK"
2012-07-17 09:38:38 -07:00
71d41178b9
am b8910812: am a214d84f: docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
...
* commit 'b8910812fdd0bb2105738b6b24fc0b9e4b201956':
docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
2012-07-16 18:41:46 -07:00
b8910812fd
am a214d84f: docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
...
* commit 'a214d84ff82bb3ae279b1f2c8ece5f65656b5e5c':
docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
2012-07-16 18:38:14 -07:00
a214d84ff8
docs: upgrades to search.
...
Fix history navigation functionality.
Faster ajax requery while typing.
Ignore ENTER key when performing requery to avoid reload.
Improve results reveal with minimum height for proper div.
Change-Id: Ie50a6d7bdf58ad3e17dd15d30dcec973a123b7bf
2012-07-16 18:12:22 -07:00
5f51f8a281
am 8f4df715: am 220c3449: docs: adjust spacing for collapsible sections (release notes)
...
* commit '8f4df715b8a74b9df1b0560d910f1dabd86dbf9d':
docs: adjust spacing for collapsible sections (release notes)
2012-07-16 15:50:13 -07:00
8f4df715b8
am 220c3449: docs: adjust spacing for collapsible sections (release notes)
...
* commit '220c34492ae24f79f9b4a4fe15051360c8505807':
docs: adjust spacing for collapsible sections (release notes)
2012-07-16 15:46:46 -07:00
220c34492a
docs: adjust spacing for collapsible sections (release notes)
...
Change-Id: I68c8429e0e18bff50463b40f163df6a89ac8730a
2012-07-16 15:40:17 -07:00
eb5cbb97f7
JRO03G
2012-07-16 12:15:57 -07:00
fb1951e2f4
add TestingCamera to mini for generic PDK
...
Change-Id: I8a04c48e173d8742bf852d242e2efc0577287608
2012-07-16 12:15:54 -07:00
20f8a0adac
JRO03F
2012-07-13 14:19:15 -07:00
915b91599e
JRO03E
2012-07-13 13:38:41 -07:00
346485f536
am 938cf057: Merge 2f16ba59
...
* commit '938cf057c5988c155fc316daf7bac301e2e019fd':
Android 4.1.2 version bump
2012-07-13 12:16:38 -07:00
938cf057c5
Merge 2f16ba59
...
Change-Id: I3bf0eacfde7c61e22dcf6c2709fc7caccdfd48cc
2012-07-13 12:14:04 -07:00
a882cd9b8d
JRO03D
2012-07-12 17:26:25 -07:00
2f16ba5997
Android 4.1.2 version bump
...
Change-Id: Ie135022b4ddcac457071aec7b217d41ebdcde188
2012-07-12 16:21:00 -07:00
fb3083ef6f
am 96d9fa29: resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp
...
* commit '96d9fa29cd1ff48b733eb090e99fe165d194d313':
use default shell (mksh) in emulator
2012-07-12 09:36:35 -07:00
b71a27bae5
JZO11
2012-07-11 23:17:54 -07:00
40d7329ba6
JZO10
2012-07-11 23:16:01 -07:00
832de9cee3
merge in jb-mr0-release history after reset to jb-dev
2012-07-11 23:11:59 -07:00
96d9fa29cd
resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp
...
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
2012-07-11 19:36:17 -07:00
ef1335eda4
use default shell (mksh) in emulator
...
remove the override to use ash as shell so that mksh is the
default in 'generic' product type
Change-Id: I91d76d0fc522baf5d47096ab19ea264c9b1268e6
2012-07-11 18:35:08 -07:00
a44a92914b
Merge commit 'c16c9454' into mit
...
* commit 'c16c9454':
Create telephony-common and mms-common
2012-07-11 18:08:21 -07:00
Ying Wang