1671c74be6
am e78893d3: am ba71aba9: Allow to run Proguard on static Java library
...
* commit 'e78893d3e0106f70adccac773cf08c23aa2fda3e':
Allow to run Proguard on static Java library
2013-03-26 14:11:31 -07:00
e78893d3e0
am ba71aba9: Allow to run Proguard on static Java library
...
* commit 'ba71aba939dc58a3278646039337f13d17e65ef2':
Allow to run Proguard on static Java library
2013-03-26 14:09:36 -07:00
ba71aba939
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
2013-03-26 14:05:10 -07:00
6062fc03b4
am 196aacf2: (-s ours) am 68b1d3b0: am 545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '196aacf2fdea6c9070a2a3a9dc1a9fe43dec48ba':
JDQ39E
JDQ39D
JDQ39C
2013-03-26 12:17:51 -07:00
edae933ee1
am 565b5d1b: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '565b5d1b973b587d57222eb0f9a6f2b07623bca3':
JWQ85
JWQ84B
JWQ84
JWQ80C
JWQ80B
JWQ80
JWQ79B
2013-03-26 12:17:38 -07:00
196aacf2fd
am 68b1d3b0: am 545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '68b1d3b077af7561934a16f3d7e1accf461870cf':
JDQ39E
JDQ39D
JDQ39C
2013-03-26 10:57:33 -07:00
68b1d3b077
am 545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '545c8eed678101a836972c5f68941078f7fb0863':
JDQ39E
JDQ39D
JDQ39C
2013-03-26 10:54:40 -07:00
545c8eed67
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ia0536d6a75f255879a24145def55c44c93050aaa
2013-03-26 10:53:09 -07:00
565b5d1b97
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Icbbd50582351b94fc2d424995331daac6edf5855
2013-03-26 10:49:03 -07:00
1e71487b2d
JWQ85
2013-03-26 05:57:37 -07:00
6cd2d19060
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-26 05:55:13 -07:00
efd91eaee4
am df122f1f: 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 'df122f1fe63c57adbfe9df1b3918d08cb9363736':
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
2013-03-26 01:25:32 +00:00
df122f1fe6
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
2013-03-26 01:24:00 +00:00
531a620474
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
2013-03-25 18:19:46 -07:00
964c6321ae
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
2013-03-25 16:17:42 -07:00
709fcf04a0
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
2013-03-25 16:15:12 -07:00
2325250e63
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
2013-03-25 16:13:29 -07:00
9ae6d37ad0
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 'de2952768478e6390bcec424bb102911e7f4cbff':
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
2013-03-25 16:11:44 -07:00
de29527684
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
Change-Id: I64750e3b96ea585de415969cad8ab46c3bbbcaf4
2013-03-25 15:54:05 -07:00
9ea3ce11ba
JWQ84B
2013-03-25 15:35:00 -07:00
0810498018
am a5b29e21: am 1579e231: Merge "Support to build vendor.img" into jb-mr2-dev
...
* commit 'a5b29e212a847fc285fc72c2e13c37b133e09119':
Support to build vendor.img
2013-03-25 20:55:54 +00:00
a5b29e212a
am 1579e231: Merge "Support to build vendor.img" into jb-mr2-dev
...
* commit '1579e23178a6ae72bb3051a0385a1852dd970f1a':
Support to build vendor.img
2013-03-25 20:53:39 +00:00
1579e23178
Merge "Support to build vendor.img" into jb-mr2-dev
2013-03-25 20:48:53 +00:00
63143019f1
am 0cfdb4e9: am 47e27a4f: Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
...
* commit '0cfdb4e9650975077a74bb5c812e79556ac67421':
core: combo: arm: use appropriate mcpu flags for cortex-a7
2013-03-25 19:44:53 +00:00
0cfdb4e965
am 47e27a4f: Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
...
* commit '47e27a4f9ca67facd6501bf24314e6e02117b0d4':
core: combo: arm: use appropriate mcpu flags for cortex-a7
2013-03-25 19:43:40 +00:00
47e27a4f9c
Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
2013-03-25 19:42:45 +00:00
a0febe5e6d
Support to build vendor.img
...
Bug: 8341435
Change-Id: I2db7970936984d38aed35054e3f695d298f4e512
2013-03-25 09:53:16 -07:00
9213a5ffcc
JWQ84
2013-03-25 05:58:11 -07:00
3177c6f160
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-25 05:55:27 -07:00
bdbd716eff
core: combo: arm: use appropriate mcpu flags for cortex-a7
...
Change-Id: If00577d36257e4d03f63f36b159bb2e015958d6a
Signed-off-by: Dima Zavin <dima@android.com>
2013-03-23 02:08:38 -07:00
c77e220987
am c170360d: am b2c79174: am ca983c08: am 97c280ec: Merge "We have to use := instead of +="
...
* commit 'c170360d964fe83e0f1b58c6f7369daaf9aebdd8':
We have to use := instead of +=
2013-03-23 02:53:51 +00:00
c170360d96
am b2c79174: am ca983c08: am 97c280ec: Merge "We have to use := instead of +="
...
* commit 'b2c7917463dc898b0b361229ed3345c23ac51d83':
We have to use := instead of +=
2013-03-23 02:51:46 +00:00
b2c7917463
am ca983c08: am 97c280ec: Merge "We have to use := instead of +="
...
* commit 'ca983c08fbc49b36eb0d71476842a86afbdcb8ed':
We have to use := instead of +=
2013-03-22 19:50:09 -07:00
ca983c08fb
am 97c280ec: Merge "We have to use := instead of +="
...
* commit '97c280eced879fb79d32bd527412ab34840dba5c':
We have to use := instead of +=
2013-03-22 19:47:43 -07:00
97c280eced
Merge "We have to use := instead of +="
2013-03-23 01:56:36 +00:00
4d063410a3
We have to use := instead of +=
...
If we use +=, the right side may be deferred to evaluate,
if that target-specific variable is not defined yet.
That's a mistke.
Change-Id: I1635ee4791473f407866e010d612948c02cdebf6
2013-03-22 18:52:57 -07:00
df7265532d
am e104179b: am 9b93f37c: Delete icu4j from pathmap.mk
...
* commit 'e104179b4a0fe432f859c2bebf0513c30efe671e':
Delete icu4j from pathmap.mk
2013-03-22 19:40:04 +00:00
e104179b4a
am 9b93f37c: Delete icu4j from pathmap.mk
...
* commit '9b93f37c893979c4c01877ce7d8e653aa9af95b3':
Delete icu4j from pathmap.mk
2013-03-22 19:37:56 +00:00
9b93f37c89
Delete icu4j from pathmap.mk
...
frameworks/base/icu4j is gone in jb-mr2-dev.
Change-Id: I078c8ac3db85598a9b30f8220f251eb7631151e0
2013-03-22 12:32:50 -07:00
f2c6ad66bf
JWQ80C
2013-03-22 10:08:06 -07:00
177979a5de
am 5f3aa938: am 5fe9aaac: am 159de1de: am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
...
* commit '5f3aa9382cfefb0097cebe58614297d715f5b854':
docs: update templates to remove global content for devsite builds
2013-03-22 01:41:13 +00:00
5f3aa9382c
am 5fe9aaac: am 159de1de: am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
...
* commit '5fe9aaacefbe3d53a7be280bf017b2e77e7a66ae':
docs: update templates to remove global content for devsite builds
2013-03-22 01:38:58 +00:00
5fe9aaacef
am 159de1de: am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
...
* commit '159de1de00027ebb9280cf6768d59369416c7a13':
docs: update templates to remove global content for devsite builds
2013-03-21 18:35:43 -07:00
159de1de00
am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
...
* commit '1b8b0cfee98c8d2779dc740707b547846734053f':
docs: update templates to remove global content for devsite builds
2013-03-21 18:33:53 -07:00
1b8b0cfee9
am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
...
* commit '7908878061144b25b1e0baf36619db7b32d07c98':
docs: update templates to remove global content for devsite builds
2013-03-21 18:31:59 -07:00
7908878061
am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
...
* commit '8d92d9ef824f265979e68da927f01aba4bb6b314':
docs: update templates to remove global content for devsite builds
2013-03-21 18:29:44 -07:00
8d92d9ef82
am 01a2545b: docs: update templates to remove global content for devsite builds
...
* commit '01a2545bbab916e45eedbd3708f526ed8bd62935':
docs: update templates to remove global content for devsite builds
2013-03-21 18:27:16 -07:00
01a2545bba
docs: update templates to remove global content for devsite builds
...
Change-Id: I8c8d052248cebe6408d8c18b44baadd03f3bc96c
2013-03-21 18:12:51 -07:00
0456082c6b
JWQ80B
2013-03-21 16:08:14 -07:00
4a131b8d14
JWQ80
2013-03-21 05:57:05 -07:00
Ying Wang