OSDN Git Service
Jean-Baptiste Queru [Tue, 24 Jan 2012 22:26:30 +0000 (14:26 -0800)]
Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
Jean-Baptiste Queru [Tue, 24 Jan 2012 18:34:24 +0000 (10:34 -0800)]
Merge "stagefright aacenc: Add missing newlines at the end of files"
Jean-Baptiste Queru [Tue, 24 Jan 2012 15:51:11 +0000 (07:51 -0800)]
Merge "stagefright aacenc: Properly terminate a comment"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:47:34 +0000 (14:47 -0800)]
Merge "Rename LOG_ASSERT to ALOG_ASSERT"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:47:22 +0000 (14:47 -0800)]
Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:47:09 +0000 (14:47 -0800)]
Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:46:54 +0000 (14:46 -0800)]
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:46:39 +0000 (14:46 -0800)]
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:46:24 +0000 (14:46 -0800)]
Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)"
Steve Block [Mon, 9 Jan 2012 18:35:44 +0000 (18:35 +0000)]
Rename LOG_ASSERT to ALOG_ASSERT
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
Steve Block [Fri, 6 Jan 2012 19:20:56 +0000 (19:20 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
Steve Block [Thu, 5 Jan 2012 23:22:43 +0000 (23:22 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
Steve Block [Wed, 4 Jan 2012 20:05:49 +0000 (20:05 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
Steve Block [Tue, 20 Dec 2011 16:23:08 +0000 (16:23 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
Steve Block [Thu, 20 Oct 2011 10:56:00 +0000 (11:56 +0100)]
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:41:56 +0000 (14:41 -0800)]
Merge "Rename (IF_)LOG() to (IF_)ALOG()"
Steve Block [Wed, 12 Oct 2011 16:27:03 +0000 (17:27 +0100)]
Rename (IF_)LOG() to (IF_)ALOG()
Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
Martin Storsjo [Thu, 12 Jan 2012 12:27:01 +0000 (14:27 +0200)]
stagefright aacenc: Properly terminate a comment
This avoids a warning about /* within a comment.
Change-Id: I9079909734d35db5ab0fd54b46173d7a1848d0c9
Martin Storsjo [Wed, 22 Dec 2010 21:09:51 +0000 (22:09 +0100)]
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
Martin Storsjo [Wed, 31 Aug 2011 07:49:51 +0000 (10:49 +0300)]
stagefright aacenc: Add missing newlines at the end of files
This avoids compiler warnings about missing newlines.
Change-Id: Ieb2bb7152d794dca47c629588879032d3ba65677
Jean-Baptiste Queru [Fri, 13 Jan 2012 15:48:55 +0000 (07:48 -0800)]
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
Mans Rullgard [Tue, 5 Apr 2011 14:40:06 +0000 (17:40 +0300)]
stagefright aacenc/amrwbenc: Remove trailing whitespace
This was applied in AOSP master earlier, in commit
b21611e5b0f1797e39e781d91ade023bac87637f, but when merged
into the Google internal tree in
88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these
changes have been brought in. (The diff of this merge commit
and its first parent,
d94b71d, is empty.)
Therefore, reapply the rest of these changes on the files
that still are present in the current version.
Change-Id: I645a9b9134769958a11808a06163123d28d83e46
John Reck [Wed, 4 Jan 2012 17:49:17 +0000 (09:49 -0800)]
Fix Apache stack
Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
The Android Open Source Project [Fri, 16 Dec 2011 16:08:07 +0000 (08:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
Dirk Dougherty [Fri, 16 Dec 2011 08:25:06 +0000 (00:25 -0800)]
am
8b6ed2d1: Doc change: edits to ICS MR1 API Overview.
* commit '
8b6ed2d17d5e7e47944026679c9cba66611ab27f':
Doc change: edits to ICS MR1 API Overview.
Dirk Dougherty [Fri, 16 Dec 2011 08:01:52 +0000 (00:01 -0800)]
Doc change: edits to ICS MR1 API Overview.
Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
Joe Fernandez [Fri, 16 Dec 2011 07:12:57 +0000 (23:12 -0800)]
am
5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
* commit '
5b18c714bbff269d7db880b42de34fd1385da9f9':
docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
Joe Fernandez [Fri, 16 Dec 2011 07:11:26 +0000 (23:11 -0800)]
Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
Joe Fernandez [Fri, 16 Dec 2011 06:33:41 +0000 (22:33 -0800)]
docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
Fred Chung [Fri, 16 Dec 2011 06:35:10 +0000 (22:35 -0800)]
am
14633f1b: am
48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
* commit '
14633f1b1eea585cdc094ebae75708db2293fe56':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
Fred Chung [Fri, 16 Dec 2011 06:33:31 +0000 (22:33 -0800)]
am
48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
* commit '
48e0617b9e7d06da803c572d6584d68898733d37':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
Fred Chung [Fri, 16 Dec 2011 06:24:12 +0000 (22:24 -0800)]
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
Scott Main [Fri, 16 Dec 2011 06:14:48 +0000 (22:14 -0800)]
am
8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
* commit '
8e980c1e4e86cb4c7ea679eba3cc01d64e323b26':
docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
Scott Main [Fri, 16 Dec 2011 06:12:53 +0000 (22:12 -0800)]
Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
Scott Main [Fri, 16 Dec 2011 06:09:46 +0000 (22:09 -0800)]
am
36c67785: docs: update homepage for 4.0.3 announcment
* commit '
36c677855c0a54ede9e92aa856cb2250960e922e':
docs: update homepage for 4.0.3 announcment
Scott Main [Fri, 16 Dec 2011 06:04:46 +0000 (22:04 -0800)]
docs: update homepage for 4.0.3 announcment
Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0
Jamie Gennis [Fri, 16 Dec 2011 02:14:05 +0000 (18:14 -0800)]
SurfaceMediaSource: use the HW_TEXTURE usage bit
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a
temporary workaround for what is likely a Gralloc bug.
Bug:
5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
The Android Automerger [Fri, 16 Dec 2011 04:50:02 +0000 (20:50 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Fri, 16 Dec 2011 04:22:39 +0000 (20:22 -0800)]
am
4cb7d095: am
98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '
4cb7d0953534587ba2051c6536fdde4b2c9539d5':
docs: fix encoding issue or whatever with docs (not showing titles)
Scott Main [Fri, 16 Dec 2011 04:19:55 +0000 (20:19 -0800)]
am
98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '
98af5edc70b0b418366f5197b9aeef30f135d40e':
docs: fix encoding issue or whatever with docs (not showing titles)
Jamie Gennis [Fri, 16 Dec 2011 02:14:05 +0000 (18:14 -0800)]
SurfaceMediaSource: use the HW_TEXTURE usage bit
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a
temporary workaround for what is likely a Gralloc bug.
Bug:
5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
Scott Main [Fri, 16 Dec 2011 04:13:20 +0000 (20:13 -0800)]
docs: fix encoding issue or whatever with docs (not showing titles)
Change-Id: Iac9afc3aa36e86d2f8defc8a7252864c23ecc23b
Scott Main [Fri, 16 Dec 2011 03:59:25 +0000 (19:59 -0800)]
am
8f266b9e: am
d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit '
8f266b9e348ba69d953568624b8d0e2cea07f99d':
docs: add remembering users class to nav
Scott Main [Fri, 16 Dec 2011 03:56:47 +0000 (19:56 -0800)]
am
d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit '
d9bc2d21c55e58f83e4209749cc51f0da9869b54':
docs: add remembering users class to nav
Scott Main [Fri, 16 Dec 2011 03:55:25 +0000 (19:55 -0800)]
Merge "docs: add remembering users class to nav" into ics-mr0
Scott Main [Fri, 16 Dec 2011 03:55:00 +0000 (19:55 -0800)]
am
26e461b3: am
5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '
26e461b34f5f9eef79aa30f1304cca4262ff88ed':
Doc merge from master:Training class on Identifying and Authenticating Users.
Scott Main [Fri, 16 Dec 2011 03:52:50 +0000 (19:52 -0800)]
am
5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '
5dac1976198e5fa553749cd145c7484f3ff45c6b':
Doc merge from master:Training class on Identifying and Authenticating Users.
Scott Main [Fri, 16 Dec 2011 03:52:33 +0000 (19:52 -0800)]
docs: add remembering users class to nav
Change-Id: Iedfd5c6580dd2d23df1eaf4da6cf43d77b5866f8
Scott Main [Fri, 16 Dec 2011 03:51:48 +0000 (19:51 -0800)]
Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
Scott Main [Fri, 16 Dec 2011 03:49:50 +0000 (19:49 -0800)]
am
ce5643c7: am
abfcbd16: docs: typo in training orientation
* commit '
ce5643c7c43c2c680e683c56507ffa1bf5b9a316':
docs: typo in training orientation
Scott Main [Fri, 16 Dec 2011 03:47:47 +0000 (19:47 -0800)]
am
abfcbd16: docs: typo in training orientation
* commit '
abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
docs: typo in training orientation
Dirk Dougherty [Thu, 15 Dec 2011 23:34:41 +0000 (15:34 -0800)]
Doc merge from master:Training class on Identifying and Authenticating Users.
Conflicts:
docs/html/training/id-auth/authenticate.jd
docs/html/training/id-auth/custom_auth.jd
docs/html/training/id-auth/identify.jd
docs/html/training/id-auth/index.jd
Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69
Scott Main [Fri, 16 Dec 2011 03:33:04 +0000 (19:33 -0800)]
docs: typo in training orientation
Change-Id: I9535713d7784146e96df5b347f2be38628ce7d2c
Roman Nurik [Fri, 16 Dec 2011 03:27:25 +0000 (19:27 -0800)]
am
1584a816: am
408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
* commit '
1584a816ed2e431ae804954dc6bd2d9dc79a540e':
docs: Minor bugfix to Android U navigation design class
Roman Nurik [Fri, 16 Dec 2011 03:25:25 +0000 (19:25 -0800)]
am
408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
* commit '
408f94b1478c62f953faf29b02c3af5d8d3c5e05':
docs: Minor bugfix to Android U navigation design class
Dave Burke [Fri, 16 Dec 2011 03:25:07 +0000 (19:25 -0800)]
am
ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
* commit '
ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f':
SurfaceMediaSource: use the HW_TEXTURE usage bit
Dave Burke [Fri, 16 Dec 2011 03:23:26 +0000 (19:23 -0800)]
Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
Roman Nurik [Fri, 16 Dec 2011 03:23:00 +0000 (19:23 -0800)]
Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
Roman Nurik [Fri, 16 Dec 2011 03:20:02 +0000 (19:20 -0800)]
docs: Minor bugfix to Android U navigation design class
Change-Id: Icedd7edc33b864d1464797a78a5bb878b84f937f
Jamie Gennis [Fri, 16 Dec 2011 02:14:05 +0000 (18:14 -0800)]
SurfaceMediaSource: use the HW_TEXTURE usage bit
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a
temporary workaround for what is likely a Gralloc bug.
Bug:
5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
Scott Main [Fri, 16 Dec 2011 01:41:58 +0000 (17:41 -0800)]
am
aeb06e34: am
6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
* commit '
aeb06e34085703fe9699cdc3454558d69092bd7c':
Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
Scott Main [Fri, 16 Dec 2011 01:39:43 +0000 (17:39 -0800)]
am
5f0df1b8: am
580f0146: docs: add camera and design, remove users update title names for many lessons
* commit '
5f0df1b8db25859a1e99425cfd87562ef71e6478':
docs: add camera and design, remove users update title names for many lessons
Scott Main [Fri, 16 Dec 2011 01:39:35 +0000 (17:39 -0800)]
am
6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
* commit '
6fbddffc83312b825e888fcdb8b6e52dade05b3e':
Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
Scott Main [Fri, 16 Dec 2011 01:37:36 +0000 (17:37 -0800)]
am
580f0146: docs: add camera and design, remove users update title names for many lessons
* commit '
580f0146535e7daed83aef721f505270f7b040e1':
docs: add camera and design, remove users update title names for many lessons
Scott Main [Fri, 16 Dec 2011 01:36:58 +0000 (17:36 -0800)]
Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
Scott Main [Fri, 16 Dec 2011 00:47:26 +0000 (16:47 -0800)]
docs: add camera and design, remove users
update title names for many lessons
Change-Id: I7a3d30bcb9786a351c04f05fcee39bb42954d2e8
Sparky Rhode [Fri, 16 Dec 2011 01:25:28 +0000 (17:25 -0800)]
am
ea627994: am
fc3f8e69: Merge "Remove references to sample application" into ics-mr0
* commit '
ea627994c3940711c27e27a6d5d98bb135944710':
Remove references to sample application
Sparky Rhode [Fri, 16 Dec 2011 01:23:11 +0000 (17:23 -0800)]
am
fc3f8e69: Merge "Remove references to sample application" into ics-mr0
* commit '
fc3f8e69546ff2ea672b2c66e861424a8cf2348f':
Remove references to sample application
Sparky Rhode [Fri, 16 Dec 2011 01:21:51 +0000 (17:21 -0800)]
Merge "Remove references to sample application" into ics-mr0
Joe Fernandez [Thu, 15 Dec 2011 21:23:53 +0000 (13:23 -0800)]
docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
Change-Id: Ia8e14c1ab4dad7c51677e759d10891bd75cbe7b1
Sparky Rhode [Fri, 16 Dec 2011 00:53:35 +0000 (16:53 -0800)]
Remove references to sample application
Change-Id: If8d6d0a3cc59bd3d3462aa066c861fbcae51baf1
Roman Nurik [Fri, 16 Dec 2011 00:50:23 +0000 (16:50 -0800)]
am
eb623347: am
d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
* commit '
eb623347f9a0c46e6ccf5791c03f99d37a0b65f8':
Android U Class: Designing Effective and Intuitive App Navigation
Roman Nurik [Fri, 16 Dec 2011 00:48:25 +0000 (16:48 -0800)]
am
d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
* commit '
d37e2b35b4ad80352eca9e77b59d78f1bcf65b8c':
Android U Class: Designing Effective and Intuitive App Navigation
Roman Nurik [Fri, 16 Dec 2011 00:45:55 +0000 (16:45 -0800)]
Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
Roman Nurik [Thu, 24 Nov 2011 01:00:58 +0000 (17:00 -0800)]
Android U Class: Designing Effective and Intuitive App Navigation
Change-Id: Ic05d73c27a4ae4b18fd682e1f193acd73b8d9dc5
Scott Main [Fri, 16 Dec 2011 00:31:54 +0000 (16:31 -0800)]
am
6aee4582: am
2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
* commit '
6aee4582feae70254094e343412114c0b0abaf2d':
docs: Add training homepage, side nav, and title changes
Scott Main [Fri, 16 Dec 2011 00:29:42 +0000 (16:29 -0800)]
am
2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
* commit '
2cbcdc760cfe2af622ccb9ef41514954dab537f0':
docs: Add training homepage, side nav, and title changes
Scott Main [Fri, 16 Dec 2011 00:28:19 +0000 (16:28 -0800)]
Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
Scott Main [Fri, 16 Dec 2011 00:12:23 +0000 (16:12 -0800)]
am
fc6ac0f2: am
564e8aa4: docs: Android University - Camera class
* commit '
fc6ac0f28f9f7d06963fb330b218376099a91596':
docs: Android University - Camera class
Scott Main [Fri, 16 Dec 2011 00:10:10 +0000 (16:10 -0800)]
am
564e8aa4: docs: Android University - Camera class
* commit '
564e8aa41c29ebd10cb691851d4ecc347f8eee71':
docs: Android University - Camera class
Scott Main [Thu, 15 Dec 2011 23:59:34 +0000 (15:59 -0800)]
docs: Android University - Camera class
Change-Id: Idc0c6ca88b42908289701c8367cd5c403d85f71e
Scott Main [Thu, 15 Dec 2011 23:58:33 +0000 (15:58 -0800)]
am
19552e95: am
d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
* commit '
19552e95db26d96977daa42cda4de8e58c6feb0a':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
Scott Main [Thu, 15 Dec 2011 23:55:31 +0000 (15:55 -0800)]
am
d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
* commit '
d25ad2fdbb4cf86e2a05dbc6b8afb50760c0fe1b':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
Scott Main [Thu, 15 Dec 2011 23:40:25 +0000 (15:40 -0800)]
docs: Add training homepage, side nav, and title changes
Change-Id: I2ac6047faa7a70e06ced47665813ace4aa974af8
Scott Main [Thu, 15 Dec 2011 21:11:12 +0000 (13:11 -0800)]
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22
docs: remove some "new" tags from side navs
Change-Id: I1ca718d1e54f7726db93cb3ab5cce410ee942ed5
Adam Koch [Thu, 15 Dec 2011 20:54:52 +0000 (15:54 -0500)]
Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
Change-Id: If456e812e8627d2cc361e1ad0d42439cbd53d43c
Scott Main [Thu, 15 Dec 2011 21:14:41 +0000 (13:14 -0800)]
am
43834487: docs: remove some "new" tags from side navs
* commit '
43834487a183b69783b0de270f9b761f3afffdc1':
docs: remove some "new" tags from side navs
Scott Main [Thu, 15 Dec 2011 21:11:12 +0000 (13:11 -0800)]
docs: remove some "new" tags from side navs
Change-Id: If1341cdc456ace9037bd2175479d89454e084e22
Scott Main [Thu, 15 Dec 2011 19:11:39 +0000 (11:11 -0800)]
am
481cd5a8: am
3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
* commit '
481cd5a8938b5055942f3a9ccaeb08f373b8a4ea':
Android U Class: Monetization / Ads without Compromising User Experience
Scott Main [Thu, 15 Dec 2011 19:08:51 +0000 (11:08 -0800)]
am
3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
* commit '
3d672e1e789e171e913605945efe95a477ab0505':
Android U Class: Monetization / Ads without Compromising User Experience
Scott Main [Thu, 15 Dec 2011 18:44:11 +0000 (10:44 -0800)]
Android U Class: Monetization / Ads without Compromising User Experience
Change-Id: I1aaddc6bbbc9fc2b53119893f2b70260f1b0d9a7
Scott Main [Thu, 15 Dec 2011 18:43:46 +0000 (10:43 -0800)]
am
cf927f22: am
aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
* commit '
cf927f229f55849caf3461621023b5bd61908334':
Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
Scott Main [Thu, 15 Dec 2011 18:41:18 +0000 (10:41 -0800)]
am
aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
* commit '
aed4ced6556383483209f454c9e4872e8ad28ebf':
Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
Scott Main [Thu, 15 Dec 2011 18:25:41 +0000 (10:25 -0800)]
Android U Class: Developing Android Applications for the Enterprise.
This class uses a sample app.
Change-Id: I508edbb98c8e9dea1d3ea26c8dcd9da213330d87
Scott Main [Thu, 15 Dec 2011 18:15:21 +0000 (10:15 -0800)]
am
e4e6c066: am
f9cca66e: Docs: Training class on Identifying and Authenticating Users.
* commit '
e4e6c06641a6446c0f26a0ac59c665f34476a6b4':
Docs: Training class on Identifying and Authenticating Users.
Scott Main [Thu, 15 Dec 2011 18:13:07 +0000 (10:13 -0800)]
am
f9cca66e: Docs: Training class on Identifying and Authenticating Users.
* commit '
f9cca66e8b4acbc8d50713b4ed4b92d8274285c1':
Docs: Training class on Identifying and Authenticating Users.
Scott Main [Thu, 15 Dec 2011 18:07:03 +0000 (10:07 -0800)]
Docs: Training class on Identifying and Authenticating Users.
Change-Id: Ie2005687ca3baf28d9e01be8c10ee0f6a58a3cc3
The Android Automerger [Thu, 15 Dec 2011 06:14:25 +0000 (22:14 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Thu, 15 Dec 2011 02:19:42 +0000 (18:19 -0800)]
am
399f1df3: Merge "Fix some java docs." into ics-mr1
* commit '
399f1df38594ea8bc927ad23bfbde996a9dc161d':
Fix some java docs.
Dianne Hackborn [Thu, 15 Dec 2011 02:18:29 +0000 (18:18 -0800)]
Merge "Fix some java docs." into ics-mr1