OSDN Git Service
The Android Automerger [Mon, 15 Jul 2013 15:19:51 +0000 (08:19 -0700)]
"JSS15"
The Android Automerger [Mon, 15 Jul 2013 15:18:59 +0000 (08:18 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Sat, 13 Jul 2013 07:53:18 +0000 (00:53 -0700)]
"JSS11I"
Ying Wang [Sat, 13 Jul 2013 05:05:14 +0000 (22:05 -0700)]
Establish the built module dependencies on prebuilt shared library
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.
Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
(cherry picked from commit
ada8f296570e0bda93b433a7aa86ad138dd1705e)
The Android Automerger [Sat, 13 Jul 2013 01:49:06 +0000 (18:49 -0700)]
"JSS11H"
The Android Automerger [Sat, 13 Jul 2013 00:10:48 +0000 (17:10 -0700)]
"JSS11G"
The Android Automerger [Fri, 12 Jul 2013 19:19:57 +0000 (12:19 -0700)]
JSS11F
The Android Automerger [Fri, 12 Jul 2013 17:53:23 +0000 (10:53 -0700)]
"JSS11E"
The Android Automerger [Fri, 12 Jul 2013 03:26:53 +0000 (20:26 -0700)]
"JSS11D"
The Android Automerger [Fri, 12 Jul 2013 01:41:43 +0000 (18:41 -0700)]
JSS11C
The Android Automerger [Fri, 12 Jul 2013 00:12:16 +0000 (17:12 -0700)]
"JSS11B"
The Android Automerger [Thu, 11 Jul 2013 12:56:15 +0000 (05:56 -0700)]
"JSS11"
The Android Automerger [Thu, 11 Jul 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 10 Jul 2013 12:56:05 +0000 (05:56 -0700)]
"JSS10"
The Android Automerger [Wed, 10 Jul 2013 12:55:07 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jeff Brown [Tue, 9 Jul 2013 23:44:40 +0000 (23:44 +0000)]
Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
The Android Automerger [Tue, 9 Jul 2013 23:38:30 +0000 (16:38 -0700)]
"JSS09B"
The Android Automerger [Tue, 9 Jul 2013 12:56:31 +0000 (05:56 -0700)]
"JSS09"
The Android Automerger [Tue, 9 Jul 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jeff Brown [Tue, 9 Jul 2013 00:35:00 +0000 (00:35 +0000)]
Revert "Remove mediarouter v7 support library from SDK."
This reverts commit
0eacd936b7d6dabd380ecd6f1d25d39625b37495.
Bug:
9425325
Change-Id: Idf81e6721fb4361a38ffd73d39c574c2cb2b1155
Dirk Dougherty [Tue, 9 Jul 2013 00:33:58 +0000 (17:33 -0700)]
am
ccc15faf: am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
ccc15faf56ad46f973800cb6bd41b4634b9192a0':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:32:03 +0000 (17:32 -0700)]
am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
56811475202ededf0c76bf9b28d3e27d5761d747':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:29:54 +0000 (17:29 -0700)]
am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
5386532e03bbc76bcdf8a76877ef460bfe764925':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:28:40 +0000 (00:28 +0000)]
Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
Dirk Dougherty [Mon, 8 Jul 2013 23:05:05 +0000 (16:05 -0700)]
Doc change: Move butterbar css to template assets.
Change-Id: Ifa116fe304150c7c663b8088e00349ffdc69017c
Scott Main [Mon, 8 Jul 2013 22:28:53 +0000 (15:28 -0700)]
am
fb2bb3d8: am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
fb2bb3d867fcdd3add7e30d1cbb6b956d3fce89e':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:27:50 +0000 (15:27 -0700)]
am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
51852a3fc1120fdad1f309613439e9b42e497318':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:25:55 +0000 (15:25 -0700)]
am
8c0f5b3a: enable download box style for qv sidebox
* commit '
8c0f5b3aefac3c824155cf883e61b021a6d8fd8f':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:12:02 +0000 (15:12 -0700)]
enable download box style for qv sidebox
Change-Id: I209e9971d886e45498aab0b4d43241ded5285f24
Lorenzo Colitti [Mon, 8 Jul 2013 10:43:42 +0000 (19:43 +0900)]
Don't build clatd without clatd.conf.
Bug:
9730936
Change-Id: I2c50422c7b502d5b9bdc01afb55d25353f6c7088
The Android Automerger [Mon, 8 Jul 2013 12:56:31 +0000 (05:56 -0700)]
"JSS08"
The Android Automerger [Mon, 8 Jul 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 2 Jul 2013 18:57:14 +0000 (11:57 -0700)]
JSS02B
The Android Automerger [Tue, 2 Jul 2013 12:56:01 +0000 (05:56 -0700)]
"JSS02"
The Android Automerger [Tue, 2 Jul 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 1 Jul 2013 12:56:00 +0000 (05:56 -0700)]
"JSS01"
The Android Automerger [Mon, 1 Jul 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 30 Jun 2013 12:56:26 +0000 (05:56 -0700)]
"JSR91"
The Android Automerger [Sun, 30 Jun 2013 12:55:13 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Fri, 28 Jun 2013 21:57:23 +0000 (14:57 -0700)]
JSR88C
Ying Wang [Fri, 28 Jun 2013 20:37:27 +0000 (13:37 -0700)]
Respect DISABLE_PROGUARD
The flag is only used by unbundled build currently.
Change-Id: I8e9bab69dd7accae52ec8cdd627fc4e24178a790
The Android Automerger [Fri, 28 Jun 2013 12:25:50 +0000 (05:25 -0700)]
JSR88B
The Android Automerger [Thu, 27 Jun 2013 12:56:02 +0000 (05:56 -0700)]
"JSR88"
The Android Automerger [Thu, 27 Jun 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 26 Jun 2013 19:18:19 +0000 (12:18 -0700)]
"JSR87"
The Android Automerger [Wed, 26 Jun 2013 19:17:03 +0000 (12:17 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Ying Wang [Tue, 25 Jun 2013 19:34:11 +0000 (12:34 -0700)]
Fix use of LOCAL_CLASSPATH in droiddoc.mk
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.
Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
(cherry picked from commit
8578cab0667cf3a3da263d838e29b07060af9ba7)
The Android Automerger [Mon, 24 Jun 2013 21:55:38 +0000 (14:55 -0700)]
"JSR85"
The Android Automerger [Mon, 24 Jun 2013 21:55:02 +0000 (14:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 24 Jun 2013 21:44:20 +0000 (14:44 -0700)]
JSR78D
The Android Automerger [Mon, 24 Jun 2013 21:41:25 +0000 (14:41 -0700)]
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
The Android Automerger [Mon, 24 Jun 2013 21:34:42 +0000 (14:34 -0700)]
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
The Android Automerger [Fri, 21 Jun 2013 22:39:44 +0000 (15:39 -0700)]
JSR82B
The Android Automerger [Fri, 21 Jun 2013 18:37:27 +0000 (11:37 -0700)]
"JSR82"
The Android Automerger [Fri, 21 Jun 2013 18:35:04 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 20 Jun 2013 18:22:47 +0000 (11:22 -0700)]
JSR78C
Scott Main [Thu, 20 Jun 2013 03:25:34 +0000 (20:25 -0700)]
align sidebox with content body
Change-Id: Id6cd8cdd1b21b8ceda2a6931bb69f096c0d6deb1
Scott Main [Thu, 20 Jun 2013 01:48:27 +0000 (18:48 -0700)]
update design/develop link icons to 2x for high res display
Change-Id: I09560c395088e0f8d835199a6eb4267af50bddaa
Scott Main [Thu, 20 Jun 2013 01:04:30 +0000 (18:04 -0700)]
add style for links to Design docs from developer docs
Change-Id: I0f7e561c98277fb1b6b9c0b95a2ed7eef890c6db
The Android Automerger [Tue, 18 Jun 2013 18:32:52 +0000 (11:32 -0700)]
"JSR78B"
Scott Main [Mon, 17 Jun 2013 22:08:49 +0000 (15:08 -0700)]
add new script to toggle visibility of nested list items.
call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle
Change-Id: I6f1ee74b957f88c23550145c6ed057d8e7797c99
The Android Automerger [Mon, 17 Jun 2013 12:55:31 +0000 (05:55 -0700)]
"JSR78"
The Android Automerger [Mon, 17 Jun 2013 12:55:05 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 16 Jun 2013 12:56:42 +0000 (05:56 -0700)]
"JSR77"
The Android Automerger [Sun, 16 Jun 2013 12:55:16 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jeff Brown [Fri, 14 Jun 2013 22:46:29 +0000 (15:46 -0700)]
Remove mediarouter v7 support library from SDK.
Bug:
9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
The Android Automerger [Thu, 13 Jun 2013 12:56:10 +0000 (05:56 -0700)]
"JSR74"
The Android Automerger [Thu, 13 Jun 2013 12:55:11 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Ying Wang [Wed, 12 Jun 2013 22:25:23 +0000 (15:25 -0700)]
Dist static Java library modules.
With this change, we can build and dist static jar files, as well as
apks.
Bug:
9386024
Change-Id: Iab4660d8dfd7a2d164714a2124445de298075901
Ying Wang [Thu, 30 May 2013 17:45:46 +0000 (10:45 -0700)]
Tweak proguard flags in the 2 files.
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug:
9203442
Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
The Android Automerger [Wed, 12 Jun 2013 12:56:41 +0000 (05:56 -0700)]
"JSR73"
The Android Automerger [Wed, 12 Jun 2013 12:55:47 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 11 Jun 2013 12:56:01 +0000 (05:56 -0700)]
"JSR72"
The Android Automerger [Tue, 11 Jun 2013 12:55:07 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 10 Jun 2013 12:55:35 +0000 (05:55 -0700)]
"JSR71"
The Android Automerger [Mon, 10 Jun 2013 12:55:03 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 9 Jun 2013 12:56:51 +0000 (05:56 -0700)]
"JSR70"
The Android Automerger [Sun, 9 Jun 2013 12:55:22 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 6 Jun 2013 12:56:22 +0000 (05:56 -0700)]
"JSR67"
The Android Automerger [Thu, 6 Jun 2013 12:55:18 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
T.R. Fullhart [Mon, 18 Mar 2013 17:31:26 +0000 (10:31 -0700)]
Add support for using custom signapk.jar.
Details:
* New --signapk_path, --extra_signapk_args, --java_path.
* New --public_key_suffix, --private_key_suffix so you can change the filenames.
* Fixes raising exceptions on error.
Change-Id: I0b7014b6d779d52ae896f95dfecb1bcccf536cf4
(cherry picked from commit
a28acc6972ce35e9dfab061f175e229859d3e4db)
Clay Murphy [Wed, 5 Jun 2013 18:06:02 +0000 (11:06 -0700)]
docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html
Bug:
8905394
Change-Id: I3a89f9da01d92efd2ea6d9900305ea16a0316d63
The Android Automerger [Wed, 5 Jun 2013 18:17:07 +0000 (11:17 -0700)]
"JSR66"
The Android Automerger [Wed, 5 Jun 2013 17:00:40 +0000 (10:00 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 3 Jun 2013 12:55:38 +0000 (05:55 -0700)]
"JWR64"
The Android Automerger [Mon, 3 Jun 2013 12:55:04 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 2 Jun 2013 12:56:48 +0000 (05:56 -0700)]
"JWR63"
The Android Automerger [Sun, 2 Jun 2013 12:55:14 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Fri, 31 May 2013 20:41:15 +0000 (13:41 -0700)]
JWR60E
The Android Automerger [Fri, 31 May 2013 02:02:55 +0000 (19:02 -0700)]
JWR60D
The Android Automerger [Thu, 30 May 2013 22:26:43 +0000 (15:26 -0700)]
JWR60C
The Android Automerger [Thu, 30 May 2013 21:36:32 +0000 (14:36 -0700)]
JWR60B
Stephen Hines [Thu, 30 May 2013 21:09:35 +0000 (21:09 +0000)]
Merge "add renderscript to support library javadocs" into jb-mr2-dev
The Android Automerger [Thu, 30 May 2013 12:57:12 +0000 (05:57 -0700)]
"JWR60"
The Android Automerger [Thu, 30 May 2013 12:55:21 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 30 May 2013 00:53:49 +0000 (17:53 -0700)]
JWR59C
The Android Automerger [Wed, 29 May 2013 22:40:24 +0000 (15:40 -0700)]
JWR59B
Kenny Root [Wed, 29 May 2013 22:13:31 +0000 (22:13 +0000)]
Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev
Kenny Root [Wed, 29 May 2013 19:59:35 +0000 (12:59 -0700)]
Fix signing process for SELinux file_contexts
When not building locally and just using a target-files.zip from some
other build, it still tries to access the file_contexts from the out/
directory. This change instead looks at the unzipped target-files.zip
hierarchy to grab that information.
Bug:
9191141
Change-Id: I6ea12e82d6c6376fcada412314c5eefc97ff4853
Scott Main [Tue, 28 May 2013 21:53:22 +0000 (14:53 -0700)]
add renderscript to support library javadocs
Bug:
9188088
Change-Id: I7c34a99b73dc01c78174e5b93e5a5d3085ff81ff
OSDN Git Service
