The Android Automerger
c032786412
merge in jb-release history after reset to jb-dev
2012-06-22 15:03:34 -07:00
Scott Main
f9b799b5ba
cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df
...
return old analytics script
Change-Id: Ica4abe000b529272efa9ba7867b3e7aa6c8c9e55
2012-06-22 10:28:47 -07:00
The Android Automerger
ba18963427
JRN83
2012-06-22 10:01:55 -07:00
The Android Automerger
9be9730c96
merge in jb-release history after reset to jb-dev
2012-06-22 09:47:02 -07:00
Scott Main
e4d8f1b1f5
Massive clobber of all template files in developer site for new design
...
Change-Id: I5f243dcb377a8b2e573c404a9e685cc64e0e06d2
2012-06-21 21:29:11 -07:00
The Android Automerger
fd6d004a59
JRN82C
2012-06-21 17:58:04 -07:00
The Android Automerger
320f175c24
merge in jb-release history after reset to jb-dev
2012-06-21 17:47:30 -07:00
The Android Automerger
2afa4c5df4
JRN82B
2012-06-21 14:27:43 -07:00
The Android Automerger
2a83118976
merge in jb-release history after reset to jb-dev
2012-06-21 14:16:15 -07:00
The Android Automerger
486d6e8c1b
JRN82
2012-06-21 07:09:05 -07:00
The Android Automerger
da2e309591
merge in jb-release history after reset to jb-dev
2012-06-21 06:59:24 -07:00
The Android Automerger
30ac57a456
JRN81C
2012-06-20 18:27:28 -07:00
The Android Automerger
ff64a92b4a
JRN81B
2012-06-20 15:46:52 -07:00
The Android Automerger
5f425867c1
JRN81
2012-06-20 07:09:13 -07:00
The Android Automerger
91676d6bd9
merge in jb-release history after reset to jb-dev
2012-06-20 06:59:25 -07:00
The Android Automerger
f4d15cf1ef
JRN80C
2012-06-19 16:30:09 -07:00
Ying Wang
0872a01065
Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev
2012-06-19 14:25:14 -07:00
The Android Automerger
fde5719bda
JRN80B
2012-06-19 12:49:07 -07:00
Jean-Baptiste Queru
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
Ying Wang
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
The Android Automerger
cab8934f9d
JRN80
2012-06-19 07:10:41 -07:00
The Android Automerger
36ed5dacdb
merge in jb-release history after reset to jb-dev
2012-06-19 06:59:24 -07:00
The Android Automerger
2f78c04d78
JRN79C
2012-06-18 16:27:50 -07:00
The Android Automerger
5bd0baa402
JRN79B
2012-06-18 15:54:58 -07:00
Guang Zhu
5d76a3f2d5
Merge "add uiautomator into system image" into jb-dev
2012-06-18 11:52:42 -07:00
The Android Automerger
7be7b424b8
JRN79
2012-06-18 07:06:59 -07:00
The Android Automerger
34721324a1
merge in jb-release history after reset to jb-dev
2012-06-18 06:59:23 -07:00
The Android Automerger
5b0b2a4ec0
JRN78B
2012-06-17 17:06:48 -07:00
The Android Automerger
87888c7395
JRN78
2012-06-17 07:08:19 -07:00
The Android Automerger
eebf803bf6
merge in jb-release history after reset to jb-dev
2012-06-17 06:59:26 -07:00
Guang Zhu
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
The Android Automerger
583216a7dc
JRN77
2012-06-16 07:11:00 -07:00
The Android Automerger
1577b15dca
merge in jb-release history after reset to jb-dev
2012-06-16 06:59:32 -07:00
Ying Wang
43ca4a45a4
Remove the user tag and legacy prebuilts for the srec modules.
...
Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
2012-06-15 18:36:06 -07:00
The Android Automerger
175026a969
JRN75E
2012-06-15 16:17:07 -07:00
The Android Automerger
fe79d01cad
JRN75D
2012-06-15 14:13:01 -07:00
The Android Automerger
ccfa22ebad
JRN75C
2012-06-14 16:48:04 -07:00
The Android Automerger
43843b6f58
JRN75B
2012-06-14 13:29:21 -07:00
Jean-Baptiste Queru
74aba61404
Allow additional vendors
...
Bug: 6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
2012-06-14 09:15:20 -07:00
The Android Automerger
91f3d748c4
JRN75
2012-06-14 07:09:54 -07:00
The Android Automerger
11b1194cf6
merge in jb-release history after reset to jb-dev
2012-06-14 06:59:24 -07:00
The Android Automerger
291b58d00d
JRN74C
2012-06-13 18:43:04 -07:00
The Android Automerger
0445111a01
JRN74B
2012-06-13 16:40:23 -07:00
The Android Automerger
d3acbf293f
JRN74
2012-06-13 09:03:15 -07:00
The Android Automerger
e0db94ba82
merge in jb-release history after reset to jb-dev
2012-06-13 08:26:26 -07:00
The Android Automerger
11ee14dd10
JRN73
2012-06-12 11:30:36 -07:00
The Android Automerger
7acc0ed4a6
merge in jb-release history after reset to jb-dev
2012-06-12 11:19:13 -07:00
The Android Automerger
9657c6160d
JRN72D
2012-06-12 08:22:39 -07:00
The Android Automerger
3b123c068d
JRN72C
2012-06-11 17:17:03 -07:00
The Android Automerger
2715ac8e13
JRN72B
2012-06-11 13:24:52 -07:00
