Commit Graph

9311 Commits

Author SHA1 Message Date
The Android Open Source Project 4af7837eac Reconcile with jb-release
Change-Id: I2b5cf5780851a3979016a50ff39f7da6d6d1a82b
2012-06-25 12:18:24 -07:00
The Android Automerger 4b06007c27 JRN84B 2012-06-25 11:31:30 -07:00
The Android Automerger 795683dd7f JRN86 2012-06-25 11:29:39 -07:00
The Android Open Source Project ad7c32bf2c Reconcile with jb-release
Change-Id: I80e21c4019904a7f755af426e3e29e41c9b23f78
2012-06-25 07:57:11 -07:00
The Android Automerger 16cd5c0855 JRN84 2012-06-23 23:28:18 -07:00
The Android Automerger 02c3d477f6 merge in jb-release history after reset to jb-dev 2012-06-23 23:13:39 -07:00
Scott Main c60a1430dc am 9ada2264: docs: darker font color
* commit '9ada22647890c18ded2b890d00c0a307bd2bed98':
  docs: darker font color
2012-06-23 17:52:58 -07:00
Scott Main 9ada226478 docs: darker font color
Change-Id: I8fe4117ac501001dd6c7156b337f3ff7a4f75793
2012-06-23 14:59:36 -07:00
Scott Main 46601e3792 am 6a7a66be: docs: try darker text and shorter line height
* commit '6a7a66beba12d6e655f3dde257a3e4964f8ad0c7':
  docs: try darker text and shorter line height
2012-06-23 11:25:21 -07:00
Scott Main 6a7a66beba docs: try darker text and shorter line height
Change-Id: I7fe3cdc0a0f5cdfd8bcb69b1e1a2d11d8b5301d3
2012-06-23 11:20:48 -07:00
Scott Main aeda97cb22 am d786a29f: docs: adjust homepage carousel styles
* commit 'd786a29f14c502986ffc160471daedfd0b5fb5dc':
  docs: adjust homepage carousel styles
2012-06-23 05:37:01 -07:00
Scott Main ac432bc995 am 25659b02: docs: update sdk template to support new ndk doc layout
* commit '25659b0217cca1389b2711ee536547b20b266319':
  docs: update sdk template to support new ndk doc layout
2012-06-23 05:37:01 -07:00
Scott Main 04977dbbb6 am 412eaf20: docs: style changes for notes
* commit '412eaf202c63b8d2cc32b5b865ba29155e047697':
  docs: style changes for notes
2012-06-23 05:36:51 -07:00
Scott Main d786a29f14 docs: adjust homepage carousel styles
Change-Id: Id2b32ce67d26a19b40e7944a5dd37cd17d8eec2a
2012-06-22 21:23:32 -07:00
The Android Automerger 8a6fb02ae5 JRN83D 2012-06-22 20:41:01 -07:00
The Android Automerger 176dfcea71 merge in jb-release history after reset to jb-dev 2012-06-22 20:37:07 -07:00
The Android Automerger 67cff69b3c JRN83C 2012-06-22 18:28:32 -07:00
The Android Automerger a73843511a merge in jb-release history after reset to jb-dev 2012-06-22 18:19:02 -07:00
Scott Main 25659b0217 docs: update sdk template to support new ndk doc layout
Change-Id: I47ec2fcd4b7116fa3dc59483a434d7f188f984d1
2012-06-22 17:02:25 -07:00
The Android Open Source Project 758a52ddde Reconcile with jb-release
Change-Id: I4a8336fb66821c570245f75901919ef6b1b9c641
2012-06-22 15:20:06 -07:00
The Android Automerger db7d1d34ea JRN83B 2012-06-22 15:14:06 -07:00
The Android Automerger c032786412 merge in jb-release history after reset to jb-dev 2012-06-22 15:03:34 -07:00
Scott Main 412eaf202c docs: style changes for notes
Change-Id: I13bc3f19780421a30feffc6e6ffe19cfadc886e5
2012-06-22 14:36:33 -07:00
Jean-Baptiste Queru 4a65f81237 am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI"
* commit '6e587f53152127370c6b45204f6529dd7b0ce32a':
  Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
2012-06-22 14:31:05 -07:00
Jean-Baptiste Queru 6e587f5315 Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI" 2012-06-22 13:47:19 -07:00
The Android Open Source Project ec0f69a81a Reconcile with jb-release
Change-Id: I8e514e78efc61e6d7cab247e3c6979a6459bcd55
2012-06-22 12:37:02 -07:00
Scott Main 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
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
The Android Open Source Project fa90185a33 Reconcile with jb-release
Change-Id: I75d44aea2008be774afc674fda49c2220583080d
2012-06-22 08:16:45 -07:00
Scott Main 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
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 Open Source Project da21229d7b Reconcile with jb-release
Change-Id: I71f037e68eda652f71ce7a15e4afff031adbd913
2012-06-20 08:25:33 -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 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
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 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
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