84e518ebcd
am f9b799b5: cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script
...
* commit 'f9b799b5ba0ed5d06c8bf442ddd4319c93fbc95f':
cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script
2012-06-22 10:31:44 -07:00
f9b799b5ba
cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df
...
return old analytics script
Change-Id: Ica4abe000b529272efa9ba7867b3e7aa6c8c9e55
2012-06-22 10:28:47 -07:00
fa90185a33
Reconcile with jb-release
...
Change-Id: I75d44aea2008be774afc674fda49c2220583080d
2012-06-22 08:16:45 -07:00
d86c00b666
am e4d8f1b1: Massive clobber of all template files in developer site for new design
...
* commit 'e4d8f1b1f5a6e2308bfeff04d7fa51ff7394c644':
Massive clobber of all template files in developer site for new design
2012-06-21 21:32:44 -07:00
e4d8f1b1f5
Massive clobber of all template files in developer site for new design
...
Change-Id: I5f243dcb377a8b2e573c404a9e685cc64e0e06d2
2012-06-21 21:29:11 -07:00
fd6d004a59
JRN82C
2012-06-21 17:58:04 -07:00
320f175c24
merge in jb-release history after reset to jb-dev
2012-06-21 17:47:30 -07:00
2afa4c5df4
JRN82B
2012-06-21 14:27:43 -07:00
2a83118976
merge in jb-release history after reset to jb-dev
2012-06-21 14:16:15 -07:00
486d6e8c1b
JRN82
2012-06-21 07:09:05 -07:00
da2e309591
merge in jb-release history after reset to jb-dev
2012-06-21 06:59:24 -07:00
30ac57a456
JRN81C
2012-06-20 18:27:28 -07:00
ff64a92b4a
JRN81B
2012-06-20 15:46:52 -07:00
da21229d7b
Reconcile with jb-release
...
Change-Id: I71f037e68eda652f71ce7a15e4afff031adbd913
2012-06-20 08:25:33 -07:00
5f425867c1
JRN81
2012-06-20 07:09:13 -07:00
91676d6bd9
merge in jb-release history after reset to jb-dev
2012-06-20 06:59:25 -07:00
f4d15cf1ef
JRN80C
2012-06-19 16:30:09 -07:00
9b76c054c6
am 0872a010: Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev
...
* commit '0872a010659d20633f07f4ef54cf61f8e4b6e030':
More flexibility to keep/remove R.class in static Java library
2012-06-19 14:27:31 -07:00
0872a01065
Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev
2012-06-19 14:25:14 -07:00
fde5719bda
JRN80B
2012-06-19 12:49:07 -07:00
a644e7bb66
am 03bb0851: Remove references to packages that don\'t exist any more.
...
* commit '03bb0851d6a86ac51becaa132f96ed1d8f4b604c':
Remove references to packages that don't exist any more.
2012-06-19 11:27:26 -07:00
03bb0851d6
Remove references to packages that don't exist any more.
...
Those can't be found anywhere in the build system.
Change-Id: I3b3727e7735de0dbffae930cf99a6d6ccbc79570
2012-06-19 11:17:27 -07:00
ae25ec1bcd
More flexibility to keep/remove R.class in static Java library
...
- Usually you don't need to set LOCAL_JAR_EXCLUDE_FILES in your
Android.mk, if your static library is directly used by an app.
- If your library will be included by another library that need
reference the R/Manifest class, you can set
LOCAL_JAR_EXCLUDE_FILES := none
to keep the generated classes.
- If your library includes another static library that has Android
resource and you want to remove the generated classes carried by
the static library, set:
LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES)
With the LOCAL_JAR_EXCLUDE_FILES value "none", deprecate the old
long variable LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY.
Change-Id: I3b9ad5d66f0262f784feb09bc1537c5b01256258
2012-06-19 10:40:37 -07:00
ef3a532141
Reconcile with jb-release
...
Change-Id: Id011e3aaae44e404d9e7b75e5a52f097d2317126
2012-06-19 07:15:29 -07:00
cab8934f9d
JRN80
2012-06-19 07:10:41 -07:00
36ed5dacdb
merge in jb-release history after reset to jb-dev
2012-06-19 06:59:24 -07:00
e8d1719bd2
Reconcile with jb-release
...
Change-Id: I7cea6b7dd25e75e4b0a738cfa890fcaa556c2d0b
2012-06-19 06:13:10 -07:00
2f78c04d78
JRN79C
2012-06-18 16:27:50 -07:00
5bd0baa402
JRN79B
2012-06-18 15:54:58 -07:00
d214c7e495
am 5d76a3f2: Merge "add uiautomator into system image" into jb-dev
...
* commit '5d76a3f2d53fceb883d84d214c28c51bc3e5b43c':
add uiautomator into system image
2012-06-18 11:55:49 -07:00
5d76a3f2d5
Merge "add uiautomator into system image" into jb-dev
2012-06-18 11:52:42 -07:00
5112562108
am 43ca4a45: Remove the user tag and legacy prebuilts for the srec modules.
...
* commit '43ca4a45a43e2084b5a40af90ff523b0417d31c0':
Remove the user tag and legacy prebuilts for the srec modules.
2012-06-18 10:33:33 -07:00
7be7b424b8
JRN79
2012-06-18 07:06:59 -07:00
34721324a1
merge in jb-release history after reset to jb-dev
2012-06-18 06:59:23 -07:00
5b0b2a4ec0
JRN78B
2012-06-17 17:06:48 -07:00
87888c7395
JRN78
2012-06-17 07:08:19 -07:00
eebf803bf6
merge in jb-release history after reset to jb-dev
2012-06-17 06:59:26 -07:00
e770754b9f
add uiautomator into system image
...
this includes 2 pieces:
* uiautomator shell script
* uiautomator.jar: test runner and the automation framework
classes
source is under frameworks/testing/uiautomator
Change-Id: I237d85b8917d2451cf35362d2e34786940897921
2012-06-17 00:33:08 -07:00
583216a7dc
JRN77
2012-06-16 07:11:00 -07:00
1577b15dca
merge in jb-release history after reset to jb-dev
2012-06-16 06:59:32 -07:00
43ca4a45a4
Remove the user tag and legacy prebuilts for the srec modules.
...
Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
2012-06-15 18:36:06 -07:00
175026a969
JRN75E
2012-06-15 16:17:07 -07:00
fe79d01cad
JRN75D
2012-06-15 14:13:01 -07:00
ccfa22ebad
JRN75C
2012-06-14 16:48:04 -07:00
43843b6f58
JRN75B
2012-06-14 13:29:21 -07:00
ffbef646d2
am 74aba614: Allow additional vendors
...
* commit '74aba61404f0c1ea8693d2959d81d8b5b1bdf5d4':
Allow additional vendors
2012-06-14 09:24:18 -07:00
74aba61404
Allow additional vendors
...
Bug: 6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
2012-06-14 09:15:20 -07:00
91f3d748c4
JRN75
2012-06-14 07:09:54 -07:00
11b1194cf6
merge in jb-release history after reset to jb-dev
2012-06-14 06:59:24 -07:00
291b58d00d
JRN74C
2012-06-13 18:43:04 -07:00
Scott Main