git.osdn.net Git - android-x86/frameworks-base.git/log

Alexander Lucas [Thu, 19 Apr 2012 03:22:19 +0000 (20:22 -0700)]

am c54c03d6: am 773740ed: Initial commit of backup API section of cloudsync class.

* commit 'c54c03d684441b8b6c5ee840e18119a0f92e1436':
Initial commit of backup API section of cloudsync class.

commit | commitdiff | tree

Alexander Lucas [Thu, 19 Apr 2012 03:19:56 +0000 (20:19 -0700)]

am 773740ed: Initial commit of backup API section of cloudsync class.

* commit '773740ed79075e6daffaea0c62857348ab54d93e':
Initial commit of backup API section of cloudsync class.

commit | commitdiff | tree

Alexander Lucas [Mon, 16 Apr 2012 20:13:09 +0000 (13:13 -0700)]

Initial commit of backup API section of cloudsync class.

Branch switch from ics-mr0, original post here:
https://android-git.corp.google.com/g/#/c/150873/

Change-Id: I4c53b99bd326c9f8fa485392e87dfba35e662936

commit | commitdiff | tree

Scott Main [Thu, 19 Apr 2012 02:58:18 +0000 (19:58 -0700)]

am 07617980: am 99e83bc4: docs: move the location class into basics/

* commit '07617980afd9c618f796abe23319894284e0fc0b':

commit | commitdiff | tree

Scott Main [Thu, 19 Apr 2012 02:57:22 +0000 (19:57 -0700)]

am 7ea4c070: am 99e83bc4: docs: move the location class into basics/

* commit '7ea4c0705c4df60521778b246949c42bc6d8b17b':
docs: move the location class into basics/

commit | commitdiff | tree

Scott Main [Thu, 19 Apr 2012 02:55:23 +0000 (19:55 -0700)]

am 99e83bc4: docs: move the location class into basics/

* commit '99e83bc43abab567d16515eaf51bd9cb9eb3b5fb':
docs: move the location class into basics/

commit | commitdiff | tree

Scott Main [Thu, 19 Apr 2012 02:55:03 +0000 (19:55 -0700)]

am 99e83bc4: docs: move the location class into basics/

* commit '99e83bc43abab567d16515eaf51bd9cb9eb3b5fb':
docs: move the location class into basics/

commit | commitdiff | tree

Scott Main [Thu, 19 Apr 2012 02:43:11 +0000 (19:43 -0700)]

docs: move the location class into basics/

Change-Id: I0a5025ffbce4f25dc6c1b8f819a8c27def437649

commit | commitdiff | tree

Quddus Chong [Thu, 19 Apr 2012 00:07:04 +0000 (17:07 -0700)]

am fd84c2ec: am 13bb0791: Merge "docs: Added missing comma in code snippet. Bug: 6322757" into ics-mr1

* commit 'fd84c2ece24c447aa4f538dacf8d6333964d20ca':

commit | commitdiff | tree

Quddus Chong [Thu, 19 Apr 2012 00:04:31 +0000 (17:04 -0700)]

am 2f675105: am 13bb0791: Merge "docs: Added missing comma in code snippet. Bug: 6322757" into ics-mr1

* commit '2f675105ec35987b85327c97de2aacb169174c47':
docs: Added missing comma in code snippet. Bug: 6322757

commit | commitdiff | tree

Quddus Chong [Thu, 19 Apr 2012 00:02:40 +0000 (17:02 -0700)]

am 13bb0791: Merge "docs: Added missing comma in code snippet. Bug: 6322757" into ics-mr1

* commit '13bb0791a1cec6a678db3bd7ab23060b3bb911ae':
docs: Added missing comma in code snippet. Bug: 6322757

commit | commitdiff | tree

Quddus Chong [Thu, 19 Apr 2012 00:02:22 +0000 (17:02 -0700)]

am 13bb0791: Merge "docs: Added missing comma in code snippet. Bug: 6322757" into ics-mr1

* commit '13bb0791a1cec6a678db3bd7ab23060b3bb911ae':
docs: Added missing comma in code snippet. Bug: 6322757

commit | commitdiff | tree

Quddus Chong [Thu, 19 Apr 2012 00:00:32 +0000 (17:00 -0700)]

Merge "docs: Added missing comma in code snippet. Bug: 6322757" into ics-mr1

commit | commitdiff | tree

Joe Fernandez [Wed, 18 Apr 2012 23:30:31 +0000 (16:30 -0700)]

am 79dbe8bf: am 68822239: docs: Android SDK r19 Release Notes

* commit '79dbe8bf51a3bbeef6e71a0ca5365c45150f5339':

commit | commitdiff | tree

Joe Fernandez [Wed, 18 Apr 2012 23:28:20 +0000 (16:28 -0700)]

am 52a7eb0b: am 68822239: docs: Android SDK r19 Release Notes

* commit '52a7eb0b9465d2c737eb1f9ea53b357b79c6417b':
docs: Android SDK r19 Release Notes

commit | commitdiff | tree

Joe Fernandez [Wed, 18 Apr 2012 23:27:25 +0000 (16:27 -0700)]

am 68822239: docs: Android SDK r19 Release Notes

* commit '68822239a50206a474289a380ff78146ff486a3e':
docs: Android SDK r19 Release Notes

commit | commitdiff | tree

Joe Fernandez [Wed, 18 Apr 2012 23:26:18 +0000 (16:26 -0700)]

am 68822239: docs: Android SDK r19 Release Notes

* commit '68822239a50206a474289a380ff78146ff486a3e':
docs: Android SDK r19 Release Notes

commit | commitdiff | tree

Joe Fernandez [Tue, 17 Apr 2012 21:48:03 +0000 (14:48 -0700)]

docs: Android SDK r19 Release Notes

Change-Id: I9db59116259d087f03598f87aac099772a831eff

commit | commitdiff | tree

Chris Craik [Tue, 17 Apr 2012 19:05:12 +0000 (12:05 -0700)]

am 4f998a1e: am fd862e98: Add header for forward compatibility

* commit '4f998a1e4865f11f772bbe18a702f4ad95ab353e':
Add header for forward compatibility

commit | commitdiff | tree

Chris Craik [Tue, 17 Apr 2012 19:02:47 +0000 (12:02 -0700)]

am fd862e98: Add header for forward compatibility

* commit 'fd862e9828d544f593a622f2914d1257366ae802':
Add header for forward compatibility

commit | commitdiff | tree

Chris Craik [Tue, 17 Apr 2012 17:45:52 +0000 (10:45 -0700)]

Add header for forward compatibility

Change-Id: I6e3da852d50fc14cfb6fb50f7dd867f37daea19d

commit | commitdiff | tree

Fred Chung [Tue, 17 Apr 2012 16:52:44 +0000 (09:52 -0700)]

am 57e351f5: am 3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1

* commit '57e351f57cc296ed3ef29bdf071713689fc4516e':

commit | commitdiff | tree

Fred Chung [Tue, 17 Apr 2012 16:51:55 +0000 (09:51 -0700)]

am fe71253b: am 3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1

* commit 'fe71253b334e105a9f67dcef6f8790c246725976':
Updated "Making your App Location Aware" class to include information on location provider enable check.

commit | commitdiff | tree

Fred Chung [Tue, 17 Apr 2012 16:48:44 +0000 (09:48 -0700)]

am 3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1

* commit '3d467946b2950c6a5e4946c49a33cf4c8d68df20':
Updated "Making your App Location Aware" class to include information on location provider enable check.

commit | commitdiff | tree

Fred Chung [Tue, 17 Apr 2012 16:48:01 +0000 (09:48 -0700)]

commit | commitdiff | tree

Fred Chung [Tue, 17 Apr 2012 16:46:11 +0000 (09:46 -0700)]

Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1

commit | commitdiff | tree

Fred Chung [Mon, 16 Apr 2012 07:40:06 +0000 (00:40 -0700)]

Updated "Making your App Location Aware" class to include information on location provider enable check.

Change-Id: Ie6e966b4204eed60f518759480cebc945f87d91f

commit | commitdiff | tree

Roman Nurik [Sat, 14 Apr 2012 00:53:47 +0000 (17:53 -0700)]

am 08135aa1: am 38e09c3d: docs: Android Training: Creating Backward-Compatible UIs class

* commit '08135aa17fc5e5e8ecfebf04c10911fb083c3660':

commit | commitdiff | tree

Roman Nurik [Sat, 14 Apr 2012 00:53:17 +0000 (17:53 -0700)]

am 3fc245a1: am 38e09c3d: docs: Android Training: Creating Backward-Compatible UIs class

* commit '3fc245a181269c5e425698d8ad212015812ebd8d':
docs: Android Training: Creating Backward-Compatible UIs class

commit | commitdiff | tree

Roman Nurik [Sat, 14 Apr 2012 00:51:40 +0000 (17:51 -0700)]

am 38e09c3d: docs: Android Training: Creating Backward-Compatible UIs class

* commit '38e09c3ddb7da47a23bf4221ab678e058c7e923a':
docs: Android Training: Creating Backward-Compatible UIs class

commit | commitdiff | tree

Roman Nurik [Sat, 14 Apr 2012 00:51:16 +0000 (17:51 -0700)]

am 38e09c3d: docs: Android Training: Creating Backward-Compatible UIs class

* commit '38e09c3ddb7da47a23bf4221ab678e058c7e923a':
docs: Android Training: Creating Backward-Compatible UIs class

commit | commitdiff | tree

Roman Nurik [Thu, 29 Mar 2012 00:55:24 +0000 (17:55 -0700)]

docs: Android Training: Creating Backward-Compatible UIs class

Change-Id: I9a3038839c7849ecbb144b218ce5a08bdcd35886

commit | commitdiff | tree

Roman Nurik [Sat, 14 Apr 2012 00:26:39 +0000 (17:26 -0700)]

am 29934896: am 19266f7b: docs: Android Training: Implementing Effective Navigation class

* commit '299348968aae3fa29dca167bfcc847ed5c65927b':

commit | commitdiff | tree

Roman Nurik [Sat, 14 Apr 2012 00:26:03 +0000 (17:26 -0700)]

am f872e0b9: am 19266f7b: docs: Android Training: Implementing Effective Navigation class

* commit 'f872e0b959877d2685bf5bf0e83c4e6865163203':
docs: Android Training: Implementing Effective Navigation class

commit | commitdiff | tree

Roman Nurik [Sat, 14 Apr 2012 00:23:53 +0000 (17:23 -0700)]

am 19266f7b: docs: Android Training: Implementing Effective Navigation class

* commit '19266f7b02c91d21d630c99d593f83cc427cd40b':
docs: Android Training: Implementing Effective Navigation class

commit | commitdiff | tree

Roman Nurik [Sat, 14 Apr 2012 00:23:40 +0000 (17:23 -0700)]

am 19266f7b: docs: Android Training: Implementing Effective Navigation class

* commit '19266f7b02c91d21d630c99d593f83cc427cd40b':
docs: Android Training: Implementing Effective Navigation class

commit | commitdiff | tree

Roman Nurik [Tue, 13 Mar 2012 04:48:47 +0000 (21:48 -0700)]

docs: Android Training: Implementing Effective Navigation class

Change-Id: Ife2f666e78e3fc0b28ad23321fd98926973e037b

commit | commitdiff | tree

Quddus Chong [Fri, 13 Apr 2012 18:17:24 +0000 (11:17 -0700)]

docs: Added missing comma in code snippet.
Bug: 6322757

Change-Id: I32cbd89493287cbb5d76b59647a8ddbd59209132

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 12 Apr 2012 22:35:10 +0000 (15:35 -0700)]

am bd60a520: am 3d7f0cb3: Update header for forward compatibility

* commit 'bd60a52090553aef02d07e283c7f07de70837ad8':
Update header for forward compatibility

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 12 Apr 2012 22:32:44 +0000 (15:32 -0700)]

am 3d7f0cb3: Update header for forward compatibility

* commit '3d7f0cb3d9724eb4a45611127e0986538e838964':
Update header for forward compatibility

commit | commitdiff | tree

Quddus Chong [Thu, 12 Apr 2012 20:01:29 +0000 (13:01 -0700)]

am 02c6cad7: am 6971153d: Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1

* commit '02c6cad7c49942336ed6a8fe015c0cb4eced0c82':

commit | commitdiff | tree

Quddus Chong [Thu, 12 Apr 2012 20:00:18 +0000 (13:00 -0700)]

am 6073985e: am 6971153d: Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1

* commit '6073985e8a6d3f32f86a24e7a2a6bbf5b6a90b4e':
docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537

commit | commitdiff | tree

Quddus Chong [Thu, 12 Apr 2012 19:58:27 +0000 (12:58 -0700)]

am 6971153d: Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1

* commit '6971153d88ebe2e441b75081a273b88424498a45':
docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537

commit | commitdiff | tree

Quddus Chong [Thu, 12 Apr 2012 19:58:20 +0000 (12:58 -0700)]

commit | commitdiff | tree

Quddus Chong [Thu, 12 Apr 2012 19:56:29 +0000 (12:56 -0700)]

Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1

commit | commitdiff | tree

Quddus Chong [Thu, 12 Apr 2012 18:49:37 +0000 (11:49 -0700)]

docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event).
Bug: 6318537

Change-Id: I4fb0f103bfe3ddf485e1bfa76eb39a51adce1aaa

commit | commitdiff | tree

Robert Ly [Thu, 12 Apr 2012 19:34:43 +0000 (12:34 -0700)]

am 920e2eef: am 070827e6: Merge "docs: fix bug 5158332" into ics-mr1

* commit '920e2eeff321a7b029af9c1aee35b9070b2d18e8':

commit | commitdiff | tree

Robert Ly [Thu, 12 Apr 2012 19:32:18 +0000 (12:32 -0700)]

am 9a00e8f1: am 070827e6: Merge "docs: fix bug 5158332" into ics-mr1

* commit '9a00e8f138b13b551a96104675c93035ea1eface':
docs: fix bug 5158332

commit | commitdiff | tree

Robert Ly [Thu, 12 Apr 2012 19:29:33 +0000 (12:29 -0700)]

am 070827e6: Merge "docs: fix bug 5158332" into ics-mr1

* commit '070827e6031a312d368f33fb1ad8babff92e64e4':
docs: fix bug 5158332

commit | commitdiff | tree

Robert Ly [Thu, 12 Apr 2012 19:29:29 +0000 (12:29 -0700)]

am 070827e6: Merge "docs: fix bug 5158332" into ics-mr1

* commit '070827e6031a312d368f33fb1ad8babff92e64e4':
docs: fix bug 5158332

commit | commitdiff | tree

Robert Ly [Thu, 12 Apr 2012 19:27:20 +0000 (12:27 -0700)]

Merge "docs: fix bug 5158332" into ics-mr1

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 12 Apr 2012 16:57:04 +0000 (09:57 -0700)]

Update header for forward compatibility

Change-Id: Idf38142dc073dce14741e8da005e7d2eaf9242de

commit | commitdiff | tree

Jeff Sharkey [Thu, 12 Apr 2012 04:15:01 +0000 (21:15 -0700)]

am 3d33c68f: am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1

* commit '3d33c68f9e0ddc3b022e027e7644e908cfc9725e':

commit | commitdiff | tree

Jeff Sharkey [Thu, 12 Apr 2012 02:24:25 +0000 (19:24 -0700)]

am 88d97104: am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1

* commit '88d9710483c07c6fe985018e276532a2c480df81':
DO NOT MERGE: Make component names visible in javadoc.

commit | commitdiff | tree

Jeff Sharkey [Thu, 12 Apr 2012 02:21:27 +0000 (19:21 -0700)]

am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1

* commit 'd9818244f9bf47b9e2981df7866b1ace01392fa9':
DO NOT MERGE: Make component names visible in javadoc.

commit | commitdiff | tree

Jeff Sharkey [Thu, 12 Apr 2012 02:21:12 +0000 (19:21 -0700)]

am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1

* commit 'd9818244f9bf47b9e2981df7866b1ace01392fa9':
DO NOT MERGE: Make component names visible in javadoc.

commit | commitdiff | tree

Jeff Sharkey [Thu, 12 Apr 2012 02:18:45 +0000 (19:18 -0700)]

Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1

commit | commitdiff | tree

Jeff Sharkey [Thu, 12 Apr 2012 01:30:51 +0000 (18:30 -0700)]

DO NOT MERGE: Make component names visible in javadoc.

Change-Id: I3770ea6616b8425c387bcd27d668e3114b14335d

commit | commitdiff | tree

Quddus Chong [Wed, 11 Apr 2012 23:14:22 +0000 (16:14 -0700)]

am a2ac13ee: am c08787fc: Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1

* commit 'a2ac13ee0141035bfe5cd882d095a10883576392':

commit | commitdiff | tree

Quddus Chong [Wed, 11 Apr 2012 23:12:23 +0000 (16:12 -0700)]

am 51cb7ca5: am c08787fc: Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1

* commit '51cb7ca563dda1ea92b76f216e5d2960dcd62cf8':
SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971

commit | commitdiff | tree

Quddus Chong [Wed, 11 Apr 2012 23:10:23 +0000 (16:10 -0700)]

am c08787fc: Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1

* commit 'c08787fc96473b5738a4c024a13a8c7d24af496b':
SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971

commit | commitdiff | tree

Quddus Chong [Wed, 11 Apr 2012 23:09:07 +0000 (16:09 -0700)]

commit | commitdiff | tree

Quddus Chong [Wed, 11 Apr 2012 23:07:01 +0000 (16:07 -0700)]

Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1

commit | commitdiff | tree

Quddus Chong [Wed, 11 Apr 2012 18:57:50 +0000 (11:57 -0700)]

SDK doc change: Fixed typo and added method parentheses in line 206.
Bug: 6318971

Change-Id: I57f3c7aff6209269ca0d95d616e551e2100eeb54

commit | commitdiff | tree

Scott Main [Wed, 11 Apr 2012 19:47:40 +0000 (12:47 -0700)]

am f1e17d8d: am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1

* commit 'f1e17d8d47cf7746452e6e4b632209773bdd366c':

commit | commitdiff | tree

Scott Main [Wed, 11 Apr 2012 18:38:21 +0000 (11:38 -0700)]

am 06874425: am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1

* commit '068744258bce3fa5f47aa40f591793bbfa006613':
docs: add 101 class about intents, Interacting with Other Apps

commit | commitdiff | tree

Scott Main [Wed, 11 Apr 2012 18:35:52 +0000 (11:35 -0700)]

am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1

* commit '71e8f4c152a84ff420dcf834bc0acd73644f0cb0':
docs: add 101 class about intents, Interacting with Other Apps

commit | commitdiff | tree

Scott Main [Wed, 11 Apr 2012 18:34:29 +0000 (11:34 -0700)]

commit | commitdiff | tree

Scott Main [Wed, 11 Apr 2012 18:32:40 +0000 (11:32 -0700)]

Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 23:05:23 +0000 (16:05 -0700)]

docs: fix bug 5158332

Change-Id: I4ced8e7808727a6789732d10601fe6aa4985d8ba

commit | commitdiff | tree

Android Git Automerger [Tue, 10 Apr 2012 22:01:06 +0000 (15:01 -0700)]

Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:30:34 +0000 (14:30 -0700)]

am 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit '11d33b3da5fa8c46be17135deecdded9f11b61a0':
docs: fixing broken link for bug 6104366

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:30:32 +0000 (14:30 -0700)]

am b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit 'b3f7fc2f7769defa8c7de9254f0cba163a2ea63e':
docs: fixing ndk bug 5991108

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:30:30 +0000 (14:30 -0700)]

am 9fd8aaca: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '9fd8aaca4762f0852c016af34db696eebd4bfc92':
docs: fixing renderscript doc bug 6111834

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:30:15 +0000 (14:30 -0700)]

am c71a1bb9: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit 'c71a1bb9d455b547cba73947d13a50933c1cb1be':
docs: fixing broken link for bug 6104366

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:30:13 +0000 (14:30 -0700)]

am 9585dcc4: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '9585dcc48a561a87bfe3aa3c08192afbd969f4bf':
docs: fixing ndk bug 5991108

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:30:11 +0000 (14:30 -0700)]

am 86b6e26c: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '86b6e26c78bf5d491a2cf2aa06e3812be326d722':
docs: fixing renderscript doc bug 6111834

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:26:28 +0000 (14:26 -0700)]

am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
docs: fixing broken link for bug 6104366

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:26:26 +0000 (14:26 -0700)]

am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
docs: fixing ndk bug 5991108

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:26:19 +0000 (14:26 -0700)]

am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
docs: fixing renderscript doc bug 6111834

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:26:10 +0000 (14:26 -0700)]

am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
docs: fixing broken link for bug 6104366

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:26:08 +0000 (14:26 -0700)]

am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
docs: fixing ndk bug 5991108

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:26:07 +0000 (14:26 -0700)]

am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
docs: fixing renderscript doc bug 6111834

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:24:00 +0000 (14:24 -0700)]

Merge "docs: fixing broken link for bug 6104366" into ics-mr1

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:23:50 +0000 (14:23 -0700)]

Merge "docs: fixing ndk bug 5991108" into ics-mr1

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 21:23:37 +0000 (14:23 -0700)]

Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 20:30:45 +0000 (13:30 -0700)]

docs: fixing ndk bug 5991108

Change-Id: I70b5505fc424b278ea8977955857c92082a1f828

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 20:20:44 +0000 (13:20 -0700)]

docs: fixing broken link for bug 6104366

Change-Id: Ic8f7a9c5540cc0dd2251b7373e80b1f9ab6d8aa9

commit | commitdiff | tree

Robert Ly [Tue, 10 Apr 2012 17:57:33 +0000 (10:57 -0700)]

docs: fixing renderscript doc bug 6111834

Change-Id: Iea6fdaf03a0064462d57e4b62500ad689ba2b824

commit | commitdiff | tree

Teng-Hui Zhu [Tue, 10 Apr 2012 15:42:23 +0000 (08:42 -0700)]

am bbc46ae7: am 544f89ae: Update SurfaceTexture interface for forward compatibility

* commit 'bbc46ae7499bc0fa67612c67dd23c1758336c935':
Update SurfaceTexture interface for forward compatibility

commit | commitdiff | tree

Teng-Hui Zhu [Tue, 10 Apr 2012 15:38:39 +0000 (08:38 -0700)]

am 544f89ae: Update SurfaceTexture interface for forward compatibility

* commit '544f89aece46e8f4bbe4eed93116c8736e68ac07':
Update SurfaceTexture interface for forward compatibility

commit | commitdiff | tree

Teng-Hui Zhu [Mon, 9 Apr 2012 21:51:48 +0000 (14:51 -0700)]

Update SurfaceTexture interface for forward compatibility

Change-Id: I32d224428c0127800714a976b4d7bb68cc7c2464

commit | commitdiff | tree

Scott Main [Tue, 10 Apr 2012 06:55:47 +0000 (23:55 -0700)]

am be36ea9e: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit 'be36ea9e04df8f3b97dec7793e37fa1d1465922b':

commit | commitdiff | tree

Scott Main [Tue, 10 Apr 2012 00:11:21 +0000 (17:11 -0700)]

am b92851d8: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit 'b92851d850a778d1a2e5a797c2ddd315b61b15f9':
docs: Add 101 class about supporting various devices

commit | commitdiff | tree

Scott Main [Tue, 10 Apr 2012 00:08:28 +0000 (17:08 -0700)]

am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
docs: Add 101 class about supporting various devices

commit | commitdiff | tree

Scott Main [Tue, 10 Apr 2012 00:08:11 +0000 (17:08 -0700)]

am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
docs: Add 101 class about supporting various devices

commit | commitdiff | tree

Scott Main [Tue, 10 Apr 2012 00:06:15 +0000 (17:06 -0700)]

Merge "docs: Add 101 class about supporting various devices" into ics-mr1

commit | commitdiff | tree

Scott Main [Mon, 2 Apr 2012 20:11:23 +0000 (13:11 -0700)]

docs: Add 101 class about supporting various devices

Change-Id: Iafeb99c9dab8462236a41cc4991085062ff7fa14

commit | commitdiff | tree

Scott Main [Fri, 30 Mar 2012 06:03:13 +0000 (23:03 -0700)]

docs: add 101 class about intents, Interacting with Other Apps

Change-Id: I3242adafd99c34fcec4e4cece20e8c89d338c8a1

commit | commitdiff | tree

Scott Main [Mon, 9 Apr 2012 23:26:16 +0000 (16:26 -0700)]

am 7ec02d76: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1

* commit '7ec02d7648a030edaf730b6d5ff04fe888009bc3':