Scott Main
|
4fa3ad83bf
|
am b0f4513b: am 202b6523: docs: add GP Licensing redirect
* commit 'b0f4513b843d379bd7ce861855f8f9a7c17e72d6':
|
2012-04-04 11:31:14 -07:00 |
|
Raphael Moll
|
e65c5aefc4
|
am 836d66e0: (-s ours) am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE.
* commit '836d66e0eeb80bf51fd82df40091fedeac56a1d3':
|
2012-04-04 11:31:06 -07:00 |
|
The Android Automerger
|
ba316600f3
|
merge in jb-release history after reset to master
|
2012-04-04 07:00:39 -07:00 |
|
Fred Chung
|
137dce1528
|
Sample app for Android Training lesson: Making your app location aware.
Change-Id: I205a9e3f98823fbd90c5b770de8fe6ce8a9e345b
|
2012-04-03 22:46:10 -07:00 |
|
Billy Rutledge
|
87a714c17c
|
uploading sample code for AU class on Activity Lifecycle
Change-Id: Ieefd55823eaa7ce7042a5dd8739a8ab7c4b992fc
|
2012-04-03 20:39:32 -07:00 |
|
Adam Koch
|
2bab0137e0
|
Sample app for Android U class: Displaying Bitmaps Efficiently
Change-Id: I21da4e60f719b7159ada83894cca8d108bedd3d5
|
2012-04-03 23:15:18 -04:00 |
|
Billy Rutledge
|
d2d0d4feb2
|
first draft of sample code for AU basic training class on fragments
Change-Id: I15b04de5e63ecbfaa1d911a2070c5c0b01542211
|
2012-04-03 20:10:48 -07:00 |
|
Scott Main
|
a3bc3a3ae0
|
am 75ba1d06: am 20bcf936: am 202b6523: docs: add GP Licensing redirect
* commit '75ba1d06596ead76f0d95beaf66c3242d50ff6ed':
|
2012-04-03 18:29:51 -07:00 |
|
Scott Main
|
0ecea5cfde
|
am 69126b05: am 230d469e: am 202b6523: docs: add GP Licensing redirect
* commit '69126b058b2f220493a10cc39615c554a894817c':
docs: add GP Licensing redirect
|
2012-04-03 18:28:07 -07:00 |
|
Scott Main
|
75ba1d0659
|
am 20bcf936: am 202b6523: docs: add GP Licensing redirect
* commit '20bcf9363285f4185aee31747a38a5410148f381':
|
2012-04-03 18:26:59 -07:00 |
|
Scott Main
|
69126b058b
|
am 230d469e: am 202b6523: docs: add GP Licensing redirect
* commit '230d469ee9a3945dae77ab8233c2456ed764e6df':
docs: add GP Licensing redirect
|
2012-04-03 18:25:58 -07:00 |
|
Scott Main
|
230d469ee9
|
am 202b6523: docs: add GP Licensing redirect
* commit '202b6523763cb4562300b89a8c85f45646980a07':
docs: add GP Licensing redirect
|
2012-04-03 18:23:46 -07:00 |
|
Scott Main
|
b0f4513b84
|
am 202b6523: docs: add GP Licensing redirect
* commit '202b6523763cb4562300b89a8c85f45646980a07':
docs: add GP Licensing redirect
|
2012-04-03 18:23:43 -07:00 |
|
Scott Main
|
20bcf93632
|
am 202b6523: docs: add GP Licensing redirect
* commit '202b6523763cb4562300b89a8c85f45646980a07':
docs: add GP Licensing redirect
|
2012-04-03 18:23:42 -07:00 |
|
Scott Main
|
202b652376
|
docs: add GP Licensing redirect
Change-Id: I0ee44dd4ff001275b06c6bc4663e2f2b54afff34
|
2012-04-03 18:19:35 -07:00 |
|
Xavier Ducrohet
|
40525ef472
|
Move stuff from prebuilt to prebuilts/tools
Also move some atree copy to sdk.git where they belong.
Change-Id: Iab62343806917f24f47d15b9dea75e44422d8764
|
2012-04-03 16:33:35 -07:00 |
|
Mike Lockwood
|
f94c1a54d8
|
Merge "Merge remote-tracking branch 'goog/ics-aah'"
|
2012-04-03 13:05:55 -07:00 |
|
Raphael Moll
|
a01353be9d
|
am 048b8099: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp
* commit '048b80994f0199c57cfd5fea9a2d4b1ef87cc1fd':
|
2012-04-03 11:24:44 -07:00 |
|
Raphael Moll
|
ba4bde8517
|
am 7ebe18f4: (-s ours) am 07ef63f4: am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE.
* commit '7ebe18f4d4d259732f95075f95e0bd5362816632':
SDK: generate repo in xsd v6. DO NOT MERGE.
|
2012-04-03 11:24:43 -07:00 |
|
Raphael Moll
|
048b80994f
|
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp
|
2012-04-03 11:22:36 -07:00 |
|
Raphael Moll
|
b4b157a5df
|
am 8c0676c2: am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE.
* commit '8c0676c2f9e3d4bdb551815ecc859552c1a863fe':
SDK: generate repo in xsd v6. DO NOT MERGE.
|
2012-04-03 11:22:31 -07:00 |
|
Raphael Moll
|
7ebe18f4d4
|
am 07ef63f4: am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE.
* commit '07ef63f4dbd6121b1bbbef3c72316ae9a2db555b':
SDK: generate repo in xsd v6. DO NOT MERGE.
|
2012-04-03 11:22:28 -07:00 |
|
Mike Lockwood
|
4403d81204
|
Merge remote-tracking branch 'goog/ics-aah'
|
2012-04-03 11:21:20 -07:00 |
|
Raphael Moll
|
836d66e0ee
|
am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE.
* commit '2edb02ab24e0ba19065cb4d2919892c6ac268921':
SDK: generate repo in xsd v6. DO NOT MERGE.
|
2012-04-03 11:19:34 -07:00 |
|
Raphael Moll
|
07ef63f4db
|
am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE.
* commit '2edb02ab24e0ba19065cb4d2919892c6ac268921':
SDK: generate repo in xsd v6. DO NOT MERGE.
|
2012-04-03 11:19:34 -07:00 |
|
Raphael Moll
|
8c0676c2f9
|
am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE.
* commit '2edb02ab24e0ba19065cb4d2919892c6ac268921':
SDK: generate repo in xsd v6. DO NOT MERGE.
|
2012-04-03 11:19:23 -07:00 |
|
Andrew Hsieh
|
21b5db3160
|
am 6e6306d1: am 6ad643e1: am 34ccdaa8: Merge "ndk: ANativeActivity: Fix \'clazz\' member documentation."
* commit '6e6306d110f077324ca0f96890e32e958ecfb6e3':
ndk: ANativeActivity: Fix 'clazz' member documentation.
|
2012-04-03 07:29:52 -07:00 |
|
Andrew Hsieh
|
6e6306d110
|
am 6ad643e1: am 34ccdaa8: Merge "ndk: ANativeActivity: Fix \'clazz\' member documentation."
* commit '6ad643e1a98cb03603252715ad91fa69d6c5e4f3':
ndk: ANativeActivity: Fix 'clazz' member documentation.
|
2012-04-03 07:27:36 -07:00 |
|
Andrew Hsieh
|
6ad643e1a9
|
am 34ccdaa8: Merge "ndk: ANativeActivity: Fix \'clazz\' member documentation."
* commit '34ccdaa87b25c2456a76aafcf09a66b2fab236ff':
ndk: ANativeActivity: Fix 'clazz' member documentation.
|
2012-04-03 07:25:15 -07:00 |
|
Andrew Hsieh
|
34ccdaa87b
|
Merge "ndk: ANativeActivity: Fix 'clazz' member documentation."
|
2012-04-03 04:32:21 -07:00 |
|
David 'Digit' Turner
|
16c0f25354
|
ndk: ANativeActivity: Fix 'clazz' member documentation.
As discussed on android-ndk, the member is misnamed
Change-Id: I2a5a1c8dce327ddf9ab7a4d14f4e2fdf62808753
|
2012-04-03 19:30:08 +08:00 |
|
The Android Automerger
|
11b9052762
|
merge in jb-release history after reset to master
|
2012-04-03 03:29:01 -07:00 |
|
Andrew Hsieh
|
77d40ed7f4
|
Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine"
|
2012-04-02 21:16:37 -07:00 |
|
Dianne Hackborn
|
f7541b8c49
|
Change video demo theme to dark.
Change-Id: Ic5cbe5969f7a6247b3f9eb69e22c5492a46aa13b
|
2012-04-02 16:37:34 -07:00 |
|
Jason Sams
|
5ccb5d6b86
|
Merge "Relax FP requirements"
|
2012-04-02 15:26:05 -07:00 |
|
Raphael Moll
|
2edb02ab24
|
SDK: generate repo in xsd v6. DO NOT MERGE.
Requires change Ib6f5b03c and change I6ba33a96.
Change-Id: Ib42676359289e731d045c4a1e26c85fe5868d633
|
2012-04-02 15:21:41 -07:00 |
|
Trevor Johns
|
f0e8a2e538
|
am 6a635b88: am fcc3a894: am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1
* commit '6a635b882abb7bedd1d833ccfb26cdc8bdd5435e':
|
2012-04-02 14:57:38 -07:00 |
|
Trevor Johns
|
c813646bc7
|
am 93a4e8e9: am 9be60a23: am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1
* commit '93a4e8e9a076fbe82d2750e17e26abbeaeef3d1e':
Docs: Fixing broken link in TtsEngine/_index.html
|
2012-04-02 14:55:54 -07:00 |
|
Trevor Johns
|
6a635b882a
|
am fcc3a894: am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1
* commit 'fcc3a894f6e45cb23150c7f5f4406a6fdf01c094':
|
2012-04-02 14:55:04 -07:00 |
|
Trevor Johns
|
93a4e8e9a0
|
am 9be60a23: am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1
* commit '9be60a23cd67788ee4187223250c3b73427915ef':
Docs: Fixing broken link in TtsEngine/_index.html
|
2012-04-02 14:53:38 -07:00 |
|
Trevor Johns
|
aa49eb26a9
|
am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1
* commit '4947ffb99b5fd271549c33ff9aa3d3f88a27b0d7':
Docs: Fixing broken link in TtsEngine/_index.html
|
2012-04-02 14:52:23 -07:00 |
|
Trevor Johns
|
fcc3a894f6
|
am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1
* commit '4947ffb99b5fd271549c33ff9aa3d3f88a27b0d7':
Docs: Fixing broken link in TtsEngine/_index.html
|
2012-04-02 14:51:44 -07:00 |
|
Trevor Johns
|
9be60a23cd
|
am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1
* commit '4947ffb99b5fd271549c33ff9aa3d3f88a27b0d7':
Docs: Fixing broken link in TtsEngine/_index.html
|
2012-04-02 14:51:42 -07:00 |
|
Trevor Johns
|
4947ffb99b
|
Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1
|
2012-04-02 14:49:32 -07:00 |
|
Tsu Chiang Chuang
|
02b534701d
|
Add new way to calculate FPS to monkey.
Change-Id: I7ba222bfd3c6955bfeed3fda6d4bda95c129f2dc
|
2012-04-02 09:30:33 -07:00 |
|
Andrew Hsieh
|
5e00ed25de
|
am 2384a4dc: am d63680fb: am 9487df9a: Merge "Remove auto-gen project.properties"
* commit '2384a4dceedc1218aaaf62bb91e4a05cdbe3425d':
Remove auto-gen project.properties
|
2012-04-02 08:37:48 -07:00 |
|
Andrew Hsieh
|
5ac31500c8
|
am 7cd62f76: am ed42b4b0: am 2bbd700e: Merge "ndk: <dlfcn.h>: dladdr() takes a \'const void*\' parameter, not \'void*\'"
* commit '7cd62f769c6cf5ae46a29230ddf8755f0a9ccc07':
ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'
|
2012-04-02 08:37:47 -07:00 |
|
Andrew Hsieh
|
f1318a1278
|
am 45499a44: am e3f5656b: am 48aaee2c: Merge "Native media sample app for NDK API level 14"
* commit '45499a4402cca08d2b9b427d0f3364d7f25dff08':
Native media sample app for NDK API level 14
|
2012-04-02 08:37:46 -07:00 |
|
Andrew Hsieh
|
359ec88879
|
am 12866f38: am 93e83437: am 2c10ade9: Merge "ndk: android-9: Add missing <sys/eventfd.h> header"
* commit '12866f38d3a3f3ec1de0966e10d35d7bf1919182':
ndk: android-9: Add missing <sys/eventfd.h> header
|
2012-04-02 08:37:45 -07:00 |
|
Andrew Hsieh
|
338e5f5ee0
|
am aef6a76a: am f12cbd40: am ea94d94a: Merge "ndk: <signal.h>: Increase _NSIG definition to 64"
* commit 'aef6a76afbaf0643acc250cf75eb11a251ecce9a':
ndk: <signal.h>: Increase _NSIG definition to 64
|
2012-04-02 08:37:44 -07:00 |
|