OSDN Git Service
The Android Open Source Project [Wed, 3 Apr 2013 23:43:07 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If59d4eea208050457ffe142edea2aa28385e3aa3
Brian Carlstrom [Wed, 3 Apr 2013 21:19:26 +0000 (14:19 -0700)]
resolved conflicts for merge of
5ec66d15 to jb-mr2-dev-plus-aosp
Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3
Robert Ly [Wed, 3 Apr 2013 21:06:51 +0000 (14:06 -0700)]
am
ca957508: am
f3840a2c: am
99532a5a: am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
ca957508015e841d5a6a4e582d73c6d779419561':
fix android build number in footer of gms and gcm reference
Ulas Kirazci [Wed, 3 Apr 2013 21:03:22 +0000 (14:03 -0700)]
am
bde274ef: Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
* commit '
bde274ef83b9e22365205a7cd320e13bc53ae625':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Robert Ly [Wed, 3 Apr 2013 21:01:54 +0000 (14:01 -0700)]
am
f3840a2c: am
99532a5a: am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
f3840a2c2c614a271c8678fb65fc4a6148f41744':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:58:38 +0000 (13:58 -0700)]
am
99532a5a: am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
99532a5aeabe3d55fa99407e948782a6dcf15e5e':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:56:04 +0000 (13:56 -0700)]
am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
ad027032b11f592cc58286f535e087053b0220f0':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:54:00 +0000 (13:54 -0700)]
am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
e046ede5350affd49268d35692b5142d1471381d':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:52:06 +0000 (13:52 -0700)]
am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
3eba74ffc1f2a542a0d0376215fb6d2711e7639c':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:48:35 +0000 (13:48 -0700)]
am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
ddde20b67c521fbd7ad090f7a1e4ab3f69865b4f':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:38:55 +0000 (20:38 +0000)]
Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
Ulas Kirazci [Thu, 28 Mar 2013 21:02:14 +0000 (14:02 -0700)]
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
Ying Wang [Wed, 3 Apr 2013 19:31:24 +0000 (19:31 +0000)]
Merge "Add OkHttp to the platform."
The Android Automerger [Wed, 3 Apr 2013 13:03:57 +0000 (06:03 -0700)]
"JWR03"
The Android Automerger [Wed, 3 Apr 2013 13:02:06 +0000 (06:02 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 2 Apr 2013 23:55:26 +0000 (16:55 -0700)]
JWR02B
jwilson [Sat, 30 Mar 2013 13:00:01 +0000 (09:00 -0400)]
Add OkHttp to the platform.
Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
Scott Main [Tue, 2 Apr 2013 20:59:08 +0000 (13:59 -0700)]
am
248a9dd4: am
baa0023b: am
2e5602cd: am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms
* commit '
248a9dd4c91a4ca9d2410b976eab79521b97d0df':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:55:59 +0000 (13:55 -0700)]
am
baa0023b: am
2e5602cd: am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is
* commit '
baa0023b9f1e5cbc3cfa0c39ea5893cd68d5a981':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:51:52 +0000 (13:51 -0700)]
am
2e5602cd: am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into n
* commit '
2e5602cd6251d7669f5adc9ccda3a5451a0195bd':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:47:47 +0000 (13:47 -0700)]
am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit '
70174c6783f85d105157f2b2207a3d459e966237':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:44:22 +0000 (13:44 -0700)]
am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit '
07e13f7c25d22ac30a59b10feebf92a3d2df6e02':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:40:05 +0000 (13:40 -0700)]
am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit '
f614554daed6b8fe1ff646136a28c8090474b39e':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Ben Murdoch [Tue, 2 Apr 2013 17:28:21 +0000 (10:28 -0700)]
Ben Murdoch [Tue, 2 Apr 2013 17:20:10 +0000 (18:20 +0100)]
Fix SDK build.
Ensure that we include the Chromium-WebView resources.
Change-Id: I3f7b4e52ebb59fa6a8952839bb071c7994505b75
The Android Automerger [Tue, 2 Apr 2013 16:19:59 +0000 (09:19 -0700)]
"JWR02"
The Android Automerger [Tue, 2 Apr 2013 16:18:12 +0000 (09:18 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 2 Apr 2013 15:39:21 +0000 (08:39 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I60878364265a0889aaa0d1f32e709b9a4e632636
Jeff Brown [Tue, 2 Apr 2013 15:24:12 +0000 (08:24 -0700)]
am
dd243370: apicheck: Suppress certain changes in final qualifier.
* commit '
dd243370f509115a9e3bd263dcf31e74ae448bd5':
apicheck: Suppress certain changes in final qualifier.
Wink Saville [Tue, 2 Apr 2013 01:02:06 +0000 (18:02 -0700)]
am
0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '
0262d0f74725f8a165b20eeac323cdd8ca31df03':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Wink Saville [Tue, 2 Apr 2013 00:43:38 +0000 (00:43 +0000)]
Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
Scott Main [Mon, 1 Apr 2013 23:38:11 +0000 (16:38 -0700)]
load google API navtree ondemand (remove request from <head>).
Also move the code for highlighting the sidenav into a separate method
that we can call at a later time, such as after the gms reference is loaded into nav.
Change-Id: I924d68b2b9dbfed83f81d1fd418e06b6c79a9010
The Android Automerger [Mon, 1 Apr 2013 23:29:47 +0000 (16:29 -0700)]
JWR01B
Jeff Brown [Mon, 1 Apr 2013 20:40:55 +0000 (13:40 -0700)]
apicheck: Suppress certain changes in final qualifier.
It is safe for a class to become final if it was not previously
instantiable since applications could not declare subclasses
of their own.
Likewise it is always safe to remove final.
Change-Id: I9a72fee7b25ccceca2024112812b97872ba2ec6b
Ying Wang [Mon, 1 Apr 2013 19:03:46 +0000 (12:03 -0700)]
am
51f7dcb9: Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
* commit '
51f7dcb9adb60c91bf85d3148c841efa2b3a14f2':
Default install path of shared Java library with tag tests
Ying Wang [Mon, 1 Apr 2013 19:00:13 +0000 (19:00 +0000)]
Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
The Android Automerger [Mon, 1 Apr 2013 12:57:34 +0000 (05:57 -0700)]
JWR01
The Android Automerger [Mon, 1 Apr 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Sat, 30 Mar 2013 02:18:38 +0000 (19:18 -0700)]
am
a1fd8e44: Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"
* commit '
a1fd8e44b71a83f2733258b020c4057af3c4046a':
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Ying Wang [Sat, 30 Mar 2013 01:20:27 +0000 (01:20 +0000)]
Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"
Ying Wang [Sat, 30 Mar 2013 00:40:14 +0000 (17:40 -0700)]
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Change-Id: Ia3647674f294c42e9fbe2163bf0d70012313bb15
The Android Automerger [Fri, 29 Mar 2013 23:18:48 +0000 (16:18 -0700)]
JWQ87E
The Android Automerger [Fri, 29 Mar 2013 21:03:26 +0000 (14:03 -0700)]
JWQ87D
Raph Levien [Fri, 29 Mar 2013 17:44:17 +0000 (10:44 -0700)]
am
59fa08bd: Merge "Switch Indic fonts to Noto" into jb-mr2-dev
* commit '
59fa08bd3c624be9ea06789b70c22b483df612c4':
Switch Indic fonts to Noto
Raph Levien [Fri, 29 Mar 2013 17:43:08 +0000 (17:43 +0000)]
Merge "Switch Indic fonts to Noto" into jb-mr2-dev
Raph Levien [Fri, 29 Mar 2013 17:22:31 +0000 (10:22 -0700)]
Switch Indic fonts to Noto
This patch changes the fonts actually installed on the device from
the older cibu and lohit fonts to the new noto ones. Note that the
decision of whether to include the fonts based on device profile
is in the fonts.mk of the individual font projects.
Change-Id: I8b9dced0cf5bef3f8a011f925c263c346f49e407
The Android Open Source Project [Fri, 29 Mar 2013 16:48:35 +0000 (09:48 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I88a69e508f1bd76db6289d1956f0861701a30391
The Android Automerger [Fri, 29 Mar 2013 00:28:35 +0000 (17:28 -0700)]
JWQ87C
keunyoung [Fri, 29 Mar 2013 00:12:54 +0000 (17:12 -0700)]
am
6f79520b: Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
* commit '
6f79520bf77840f260b02143a556e4004e384732':
find pdk platform.zip from full_ directory as well for aosp_ products
keunyoung [Fri, 29 Mar 2013 00:11:22 +0000 (00:11 +0000)]
Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
Devin Kim [Thu, 28 Mar 2013 23:42:42 +0000 (16:42 -0700)]
am
60b9efc0: Do not disable factory build under PDK
* commit '
60b9efc060162a9ce0c8bc2ca3b9139c498eb50c':
Do not disable factory build under PDK
Ulas Kirazci [Thu, 28 Mar 2013 21:02:14 +0000 (14:02 -0700)]
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
The Android Automerger [Thu, 28 Mar 2013 22:46:28 +0000 (15:46 -0700)]
JWQ87B
keunyoung [Thu, 28 Mar 2013 21:08:31 +0000 (14:08 -0700)]
find pdk platform.zip from full_ directory as well for aosp_ products
Change-Id: I85f8c26e055958b6fa93c375f1080e297795a417
Devin Kim [Mon, 4 Feb 2013 20:24:44 +0000 (12:24 -0800)]
Do not disable factory build under PDK
This is related to commit a1712e.
Some PDKs need the factory build under PDK. If you want to disable the factory
build under PDK, use TARGET_NO_FACTORY in your device's BoardConfig.mk
Change-Id: I5e208836918ffd737951d3fb1f54c560d2b93641
The Android Automerger [Thu, 28 Mar 2013 12:57:57 +0000 (05:57 -0700)]
JWQ87
The Android Automerger [Thu, 28 Mar 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Brian Carlstrom [Thu, 28 Mar 2013 00:14:47 +0000 (17:14 -0700)]
am
d76ff19a: Merge "resolved conflicts for merge of
9a3b17d1 to jb-mr2-dev" into jb-mr2-dev
* commit '
d76ff19a0f358d1b6473c33157c5ace2128d9623':
Added local variable info output to javac command for host build.
Stephen Hines [Thu, 28 Mar 2013 00:14:43 +0000 (17:14 -0700)]
am
ffbeac3f: Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev
* commit '
ffbeac3f47d192e96c901189a3f5bd2fd4407a97':
Link RS compatibility files with libc and make bcc_compat a regular dep.
Brian Carlstrom [Thu, 28 Mar 2013 00:11:20 +0000 (00:11 +0000)]
Merge "resolved conflicts for merge of
9a3b17d1 to jb-mr2-dev" into jb-mr2-dev
Brian Carlstrom [Thu, 28 Mar 2013 00:04:05 +0000 (17:04 -0700)]
resolved conflicts for merge of
9a3b17d1 to jb-mr2-dev
Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
Stephen Hines [Wed, 27 Mar 2013 23:59:29 +0000 (23:59 +0000)]
Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev
Stephen Hines [Wed, 27 Mar 2013 23:51:38 +0000 (16:51 -0700)]
Link RS compatibility files with libc and make bcc_compat a regular dep.
If we don't do "-lc", we end up missing symbols like "memset" on our non-NEON
builds. It also makes more sense to have bcc_compat as a standard dependency
for now, since it occasionally changes the way we compile/link our source
files.
Change-Id: I4b0ead66caa7c72fb7733db8804a33faa5350930
Brian Carlstrom [Wed, 27 Mar 2013 23:40:25 +0000 (16:40 -0700)]
am
923ac1a8: Merge "Added local variable info output to javac command for host build."
* commit '
923ac1a8717f38f116708c259b8d75bc303abd5a':
Added local variable info output to javac command for host build.
The Android Automerger [Wed, 27 Mar 2013 23:22:58 +0000 (16:22 -0700)]
JWQ86C
Scott Main [Wed, 27 Mar 2013 23:14:28 +0000 (16:14 -0700)]
am
4b735966: am
6c3f41ac: am
a6188a56: am
972c3798: am
28ca0f32: am
25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '
4b7359662b532484f9a329f58b7f5c3c016a5ac5':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
Scott Main [Wed, 27 Mar 2013 23:12:22 +0000 (16:12 -0700)]
am
6c3f41ac: am
a6188a56: am
972c3798: am
28ca0f32: am
25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '
6c3f41ac7cf51c0a3405296853b075f929e07397':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
The Android Automerger [Wed, 27 Mar 2013 23:10:32 +0000 (16:10 -0700)]
JWQ86B
Scott Main [Wed, 27 Mar 2013 23:10:10 +0000 (16:10 -0700)]
am
a6188a56: am
972c3798: am
28ca0f32: am
25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '
a6188a56ea8f10a3ce81fb95fbf508cae688c4b1':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
Scott Main [Wed, 27 Mar 2013 23:07:57 +0000 (16:07 -0700)]
am
972c3798: am
28ca0f32: am
25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '
972c3798890f8b0e20005eece62ee88f508dd761':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
Scott Main [Wed, 27 Mar 2013 23:05:56 +0000 (16:05 -0700)]
am
28ca0f32: am
25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '
28ca0f324454faa3c6d40331ecb3abb1c1a13d74':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
Scott Main [Wed, 27 Mar 2013 23:03:55 +0000 (16:03 -0700)]
am
25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '
25e7300c2499d0ecaad91aecc3fbf988c59fc7da':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
Scott Main [Wed, 27 Mar 2013 22:24:06 +0000 (15:24 -0700)]
load the navtree javascript on demand; don't try setting up the tree until it's loaded
Change-Id: I1f209869a17099dd853a2f4cae766481a6cd03eb
Brian Carlstrom [Wed, 27 Mar 2013 22:44:30 +0000 (22:44 +0000)]
Merge "Added local variable info output to javac command for host build."
The Android Automerger [Wed, 27 Mar 2013 12:57:57 +0000 (05:57 -0700)]
JWQ86
The Android Automerger [Wed, 27 Mar 2013 12:55:24 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
jeffhao [Tue, 17 Apr 2012 23:24:33 +0000 (16:24 -0700)]
Added local variable info output to javac command for host build.
The host java files weren't being compiled with -g.
(cherry-picked from
3a971f734060d19fc023ccf82e39d956a31b7cfb)
Change-Id: I4274910c64ebf52ec955e30e800b34fc309db27b
gcondra@google.com [Wed, 27 Mar 2013 00:30:26 +0000 (17:30 -0700)]
am
d3e01c15: Merge commit \'
e8c9e82d\' into manualmerge
* commit '
d3e01c1577799a04ec045002ef092a6b992c3972':
Add sepolicy and mac_perms to installclean
repo sync [Wed, 27 Mar 2013 00:21:01 +0000 (17:21 -0700)]
Merge commit '
e8c9e82d' into manualmerge
Change-Id: Iaf02a0ab32918064248410aab95facac6a2b9675
Geremy Condra [Tue, 26 Mar 2013 23:39:22 +0000 (16:39 -0700)]
am
50585e76: Merge "Add sepolicy and mac_perms to installclean"
* commit '
50585e76fd13eb3d91f8d9e9e7ae5e1a3cd1ae86':
Add sepolicy and mac_perms to installclean
Ying Wang [Tue, 26 Mar 2013 23:01:02 +0000 (16:01 -0700)]
Default install path of shared Java library with tag tests
To $(PRODUCT_OUT)/data/framework/.
Change-Id: Iff6bbada47258344c13853d4fd71c7ad4b709c2c
Geremy Condra [Tue, 26 Mar 2013 22:35:50 +0000 (22:35 +0000)]
Merge "Add sepolicy and mac_perms to installclean"
William Roberts [Tue, 26 Mar 2013 21:51:18 +0000 (14:51 -0700)]
Add sepolicy and mac_perms to installclean
Remove the output files for SELinux policy
and mac_permissions.xml mapping for changes
between user and eng build.
Change-Id: Ie27dcedde0c22ce917d90466a763698c86919530
Jean-Baptiste Queru [Tue, 26 Mar 2013 21:24:07 +0000 (14:24 -0700)]
am
7716c2a3: Fix build - Add missing backslash
* commit '
7716c2a3bd1397f96a0634c9cedc6148d7e60e4d':
Fix build - Add missing backslash
Jean-Baptiste Queru [Tue, 26 Mar 2013 21:21:33 +0000 (14:21 -0700)]
Fix build - Add missing backslash
Change-Id: Ic27b8cf0d144bb32fc757f4a01141bba3280307b
Jean-Baptiste Queru [Tue, 26 Mar 2013 21:13:07 +0000 (14:13 -0700)]
am
324c1235: Rename AOSP builds to aosp_*
* commit '
324c123500d0f0da0ce92b246c65386050618563':
Rename AOSP builds to aosp_*
Ying Wang [Tue, 26 Mar 2013 21:09:36 +0000 (14:09 -0700)]
am
ba71aba9: Allow to run Proguard on static Java library
* commit '
ba71aba939dc58a3278646039337f13d17e65ef2':
Allow to run Proguard on static Java library
Jean-Baptiste Queru [Fri, 22 Mar 2013 22:53:54 +0000 (15:53 -0700)]
Rename AOSP builds to aosp_*
Change-Id: If609f66904ac560bc7a6e9ff9a43c2e039525687
Ying Wang [Tue, 26 Mar 2013 19:42:32 +0000 (12:42 -0700)]
Allow to run Proguard on static Java library
1. Let aapt output the proguard_options file
2. If proguard is enabled, switch the dependency from
$(full_classes_jar) to $(full_classes_proguard_jar).
Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
The Android Open Source Project [Tue, 26 Mar 2013 17:57:33 +0000 (10:57 -0700)]
am
68b1d3b0: am
545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
68b1d3b077af7561934a16f3d7e1accf461870cf':
JDQ39E
JDQ39D
JDQ39C
The Android Open Source Project [Tue, 26 Mar 2013 17:54:40 +0000 (10:54 -0700)]
am
545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
545c8eed678101a836972c5f68941078f7fb0863':
JDQ39E
JDQ39D
JDQ39C
The Android Open Source Project [Tue, 26 Mar 2013 17:53:09 +0000 (10:53 -0700)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ia0536d6a75f255879a24145def55c44c93050aaa
The Android Open Source Project [Tue, 26 Mar 2013 17:49:03 +0000 (10:49 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Icbbd50582351b94fc2d424995331daac6edf5855
The Android Automerger [Tue, 26 Mar 2013 12:57:37 +0000 (05:57 -0700)]
JWQ85
The Android Automerger [Tue, 26 Mar 2013 12:55:13 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Scott Main [Tue, 26 Mar 2013 01:24:00 +0000 (01:24 +0000)]
am
531a6204: am
964c6321: am
709fcf04: am
2325250e: am
9ae6d37a: am
de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '
531a620474cefc4d70c7f6c606bb6f134d8f943c':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
Scott Main [Tue, 26 Mar 2013 01:19:46 +0000 (18:19 -0700)]
am
964c6321: am
709fcf04: am
2325250e: am
9ae6d37a: am
de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '
964c6321ae015522c9f7e26d47189890b636a592':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
Scott Main [Mon, 25 Mar 2013 23:17:42 +0000 (16:17 -0700)]
am
709fcf04: am
2325250e: am
9ae6d37a: am
de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '
709fcf04a0294544658166a10021978870d756ef':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
Scott Main [Mon, 25 Mar 2013 23:15:12 +0000 (16:15 -0700)]
am
2325250e: am
9ae6d37a: am
de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '
2325250e639f3c443a8ccd006f0d591eb8f1c5d3':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
Scott Main [Mon, 25 Mar 2013 23:13:29 +0000 (16:13 -0700)]
am
9ae6d37a: am
de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '
9ae6d37ad09cad5eb3e0caa2f0b4c0a507a243f2':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google