Commit Graph

9767 Commits

Author SHA1 Message Date
Scott Main
65aed21ac9 am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1
* commit 'dfd2ae2278fba8654d9c8f81a16e8fb833c6e4f0':
  uploading sample code for AU class on Activity Lifecycle
2012-04-04 16:27:33 -07:00
Scott Main
bb3a773817 am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1
* commit 'dfd2ae2278fba8654d9c8f81a16e8fb833c6e4f0':
  uploading sample code for AU class on Activity Lifecycle
2012-04-04 16:27:18 -07:00
Scott Main
51f7a25269 am 1a669bdf: am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
* commit '1a669bdf66bc93f2af6aafa91d605fb6713f1b9b':
  first draft of sample code for AU basic training class on fragments
2012-04-04 16:27:03 -07:00
Scott Main
dfd2ae2278 Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1 2012-04-04 16:25:14 -07:00
Scott Main
1a669bdf66 am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
* commit '96f6139c59b30755ca4e7d70bc34d6391eea8c2b':
  first draft of sample code for AU basic training class on fragments
2012-04-04 16:24:41 -07:00
Scott Main
b2d2933cfd am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
* commit '96f6139c59b30755ca4e7d70bc34d6391eea8c2b':
  first draft of sample code for AU basic training class on fragments
2012-04-04 16:24:28 -07:00
Scott Main
96f6139c59 Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1 2012-04-04 16:22:49 -07:00
Fred Chung
3a4f89cc9f am e359b370: am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
* commit 'e359b3701bd144ea22ebc6551c8b35b7d99324db':
2012-04-04 14:56:42 -07:00
Xavier Ducrohet
34f38a5cdd am 4db20997: am e3e74aa5: am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"
* commit '4db20997681bbb2c7a16e1c7d50b1a1901496144':
  Move stuff from prebuilt to prebuilts/tools
2012-04-04 14:06:28 -07:00
Xavier Ducrohet
4db2099768 am e3e74aa5: am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"
* commit 'e3e74aa50e74a3465295b9405ea0fccca62472a1':
  Move stuff from prebuilt to prebuilts/tools
2012-04-04 14:03:32 -07:00
Xavier Ducrohet
e3e74aa50e am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"
* commit '2a57c79366dcdac42e330a8af752e44410556f31':
  Move stuff from prebuilt to prebuilts/tools
2012-04-04 14:01:30 -07:00
Dianne Hackborn
16bb30e381 Merge "Use fitsSystemWindows for better demoing." 2012-04-04 13:55:08 -07:00
Dianne Hackborn
6ad1018f20 Use fitsSystemWindows for better demoing.
Change-Id: I3b9e5068401e0ac1cd1d631434fe1514e8996ee3
2012-04-04 13:30:44 -07:00
Xavier Ducrohet
2a57c79366 Merge "Move stuff from prebuilt to prebuilts/tools" 2012-04-04 13:02:37 -07:00
Tsu Chiang Chuang
f4258608ea Merge "Add new way to calculate FPS to monkey." 2012-04-04 12:55:44 -07:00
Fred Chung
a41048780a am c7935836: am 42f0a7ed: am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
* commit 'c793583628c16215891bb137de96dc0500f12c6a':
2012-04-04 12:46:36 -07:00
Fred Chung
68b225a5c0 am 4f5f461b: am d074f750: am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
* commit '4f5f461b159b993455976a623617dffdd5e20c2a':
  Sample app for Android Training lesson: Making your app location aware.
2012-04-04 12:46:35 -07:00
Fred Chung
c793583628 am 42f0a7ed: am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
* commit '42f0a7ed931a977da46f71d26dc5f57835a7bdd5':
2012-04-04 12:44:47 -07:00
Fred Chung
4f5f461b15 am d074f750: am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
* commit 'd074f7505ed6614689e9204c87d6be90584f267f':
  Sample app for Android Training lesson: Making your app location aware.
2012-04-04 12:44:14 -07:00
Fred Chung
e359b3701b am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
* commit '607ac0bc7caaf02851f5ebb6b2a883491e2527e3':
  Sample app for Android Training lesson: Making your app location aware.
2012-04-04 12:41:43 -07:00
Fred Chung
d074f7505e am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
* commit '607ac0bc7caaf02851f5ebb6b2a883491e2527e3':
  Sample app for Android Training lesson: Making your app location aware.
2012-04-04 12:41:37 -07:00
Fred Chung
42f0a7ed93 am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
* commit '607ac0bc7caaf02851f5ebb6b2a883491e2527e3':
  Sample app for Android Training lesson: Making your app location aware.
2012-04-04 12:41:05 -07:00
Fred Chung
607ac0bc7c Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1 2012-04-04 12:39:21 -07:00
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
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