OSDN Git Service

android-x86/frameworks-base.git
12 years agoam 5e555df1: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new"...
Scott Main [Mon, 9 Apr 2012 22:27:22 +0000 (15:27 -0700)]
am 5e555df1: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1

* commit '5e555df1b13c030a5b9a720afc59b53be8dc02d5':
  docs: fix NDK r7c release data and remove "new" tag

12 years agoam ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
Scott Main [Mon, 9 Apr 2012 22:23:57 +0000 (15:23 -0700)]
am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1

* commit 'ede62bb6ee3ac2d98094280cea6343f62936342f':
  docs: fix NDK r7c release data and remove "new" tag

12 years agoMerge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
Scott Main [Mon, 9 Apr 2012 22:21:53 +0000 (15:21 -0700)]
Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1

12 years agoam 372e667c: am ae01af5e: docs: fix a few link titles in tv class
Scott Main [Mon, 9 Apr 2012 20:39:46 +0000 (13:39 -0700)]
am 372e667c: am ae01af5e: docs: fix a few link titles in tv class

* commit '372e667cbe3503598635387136cf299d5dfffcf9':

12 years agoam 9f6176ee: am ae01af5e: docs: fix a few link titles in tv class
Scott Main [Mon, 9 Apr 2012 20:06:36 +0000 (13:06 -0700)]
am 9f6176ee: am ae01af5e: docs: fix a few link titles in tv class

* commit '9f6176eedcce9c8b6c4f18d8fbf537952727faf3':
  docs: fix a few link titles in tv class

12 years agoam ae01af5e: docs: fix a few link titles in tv class
Scott Main [Mon, 9 Apr 2012 20:02:54 +0000 (13:02 -0700)]
am ae01af5e: docs: fix a few link titles in tv class

* commit 'ae01af5efdf8dfa8bd711bfe045722d00efddf68':
  docs: fix a few link titles in tv class

12 years agoam ae01af5e: docs: fix a few link titles in tv class
Scott Main [Mon, 9 Apr 2012 20:02:35 +0000 (13:02 -0700)]
am ae01af5e: docs: fix a few link titles in tv class

* commit 'ae01af5efdf8dfa8bd711bfe045722d00efddf68':
  docs: fix a few link titles in tv class

12 years agodocs: fix a few link titles in tv class
Scott Main [Mon, 9 Apr 2012 19:58:26 +0000 (12:58 -0700)]
docs: fix a few link titles in tv class

Change-Id: I9d87d6a5625c9a95d25354572d35990b37efbba6

12 years agodocs: fix NDK r7c release data and remove "new" tag
Scott Main [Mon, 9 Apr 2012 18:15:35 +0000 (11:15 -0700)]
docs: fix NDK r7c release data and remove "new" tag

Change-Id: I37d2dfb46aef66b75cfd93a21005748358d457ec

12 years agoam 7e9fbe11: am 5f257077: Merge "docs: add 101 Training class "Building Your First...
Scott Main [Mon, 9 Apr 2012 17:21:05 +0000 (10:21 -0700)]
am 7e9fbe11: am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1

* commit '7e9fbe11c2c8dc875a24ec51e9405ab266385c39':

12 years agoam fd41f154: am 5f257077: Merge "docs: add 101 Training class "Building Your First...
Scott Main [Mon, 9 Apr 2012 17:18:59 +0000 (10:18 -0700)]
am fd41f154: am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1

* commit 'fd41f15440eadcc5dd0b1f0d549efad293192154':
  docs: add 101 Training class "Building Your First App"

12 years agoam 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into...
Scott Main [Mon, 9 Apr 2012 17:16:17 +0000 (10:16 -0700)]
am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1

* commit '5f2570773d9b4d7d55b9bac5c9fafb56e1dcce88':
  docs: add 101 Training class "Building Your First App"

12 years agoam 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into...
Scott Main [Mon, 9 Apr 2012 17:15:46 +0000 (10:15 -0700)]
am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1

* commit '5f2570773d9b4d7d55b9bac5c9fafb56e1dcce88':
  docs: add 101 Training class "Building Your First App"

12 years agoMerge "docs: add 101 Training class "Building Your First App"" into ics-mr1
Scott Main [Mon, 9 Apr 2012 17:13:58 +0000 (10:13 -0700)]
Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1

12 years agodocs: add 101 Training class "Building Your First App"
Scott Main [Sat, 3 Mar 2012 02:02:43 +0000 (18:02 -0800)]
docs: add 101 Training class "Building Your First App"

Change-Id: I9a1f27dc2b44fac8b0e9fbeb9326b5c62a93bc41

12 years agoam 1c23169e: am 1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free...
Joe Fernandez [Fri, 6 Apr 2012 22:51:47 +0000 (15:51 -0700)]
am 1c23169e: am 1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)

* commit '1c23169eb114a1f254330b40385726c92786b47f':

12 years agoam b7df1f4e: am 1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free...
Joe Fernandez [Fri, 6 Apr 2012 22:50:34 +0000 (15:50 -0700)]
am b7df1f4e: am 1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)

* commit 'b7df1f4e92e4fbff373e46ea54477af34b5a44a4':
  docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)

12 years agoam 1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
Joe Fernandez [Fri, 6 Apr 2012 22:47:21 +0000 (15:47 -0700)]
am 1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)

* commit '1bf704bd1878fa372cfa50e7166d6ddcb1ba1369':
  docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)

12 years agoam 1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
Joe Fernandez [Fri, 6 Apr 2012 22:46:55 +0000 (15:46 -0700)]
am 1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)

* commit '1bf704bd1878fa372cfa50e7166d6ddcb1ba1369':
  docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)

12 years agodocs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
Joe Fernandez [Fri, 6 Apr 2012 22:29:36 +0000 (15:29 -0700)]
docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)

Change-Id: I561e805b2d48910ddf66432f6df40086fe59c597

12 years agoam e6c56712: am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task...
Scott Main [Fri, 6 Apr 2012 17:15:00 +0000 (10:15 -0700)]
am e6c56712: am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus

* commit 'e6c567122b76ae4282aba706092af88be43e30af':

12 years agoam 3d7c8404: am ad606697: Removed HTML artifact from index page
Alexander Lucas [Fri, 6 Apr 2012 17:14:51 +0000 (10:14 -0700)]
am 3d7c8404: am ad606697: Removed HTML artifact from index page

* commit '3d7c8404da5ffa5a5e9cca2f7c16507df463e6f0':

12 years agoam 6ff75ab5: am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
Scott Main [Fri, 6 Apr 2012 17:14:45 +0000 (10:14 -0700)]
am 6ff75ab5: am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently

* commit '6ff75ab5d7d0426bc3bbb73884b21a42af88d2df':

12 years agoam ac5ae52d: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" artic...
Trevor Johns [Fri, 6 Apr 2012 17:14:41 +0000 (10:14 -0700)]
am ac5ae52d: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1

* commit 'ac5ae52d13ef6c603ca8971579e8a981c6749e94':

12 years agoam cde2feb2: am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task...
Scott Main [Fri, 6 Apr 2012 16:49:50 +0000 (09:49 -0700)]
am cde2feb2: am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus

* commit 'cde2feb2c3628b90cada1e6e552c40aabbad2baa':
  docs: Deprecate the old UI guidelines about Activity/Task and Menus

12 years agoam 5801ead9: am ad606697: Removed HTML artifact from index page
Alexander Lucas [Fri, 6 Apr 2012 16:49:48 +0000 (09:49 -0700)]
am 5801ead9: am ad606697: Removed HTML artifact from index page

* commit '5801ead919d18f72a0538592c6c7d961e5767019':
  Removed HTML artifact from index page

12 years agoam 5756da24: am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
Scott Main [Fri, 6 Apr 2012 16:49:46 +0000 (09:49 -0700)]
am 5756da24: am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently

* commit '5756da24ad478383630e9aedc2b7b696bf844571':
  docs: Android U: Displaying Bitmaps Efficiently

12 years agoam ae6323dd: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" artic...
Trevor Johns [Fri, 6 Apr 2012 16:49:43 +0000 (09:49 -0700)]
am ae6323dd: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1

* commit 'ae6323dd1ea0e06f987b8fc097378ee3bb060f47':
  Docs: Fixing typo in "Testing from Other IDEs" article

12 years agoMerge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks...
yoonsung.nam [Fri, 6 Apr 2012 16:49:43 +0000 (09:49 -0700)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp

12 years agoam 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus
Scott Main [Fri, 6 Apr 2012 16:43:14 +0000 (09:43 -0700)]
am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus

* commit '2b0267dc3671282a1498a92da7b38fd2ef5c018f':
  docs: Deprecate the old UI guidelines about Activity/Task and Menus

12 years agoam ad606697: Removed HTML artifact from index page
Alexander Lucas [Fri, 6 Apr 2012 16:43:06 +0000 (09:43 -0700)]
am ad606697: Removed HTML artifact from index page

* commit 'ad6066970ae8f5979942178bcbbe90f72a348440':
  Removed HTML artifact from index page

12 years agoam 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
Scott Main [Fri, 6 Apr 2012 16:42:57 +0000 (09:42 -0700)]
am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently

* commit '153f8fe420506a7e1b7a8f6b4d07db798867746e':
  docs: Android U: Displaying Bitmaps Efficiently

12 years agoam e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into...
Trevor Johns [Fri, 6 Apr 2012 16:42:55 +0000 (09:42 -0700)]
am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1

* commit 'e07b58506579085b62fde0771b74111b24aa27a0':
  Docs: Fixing typo in "Testing from Other IDEs" article

12 years agoam 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus
Scott Main [Thu, 5 Apr 2012 20:20:41 +0000 (13:20 -0700)]
am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus

* commit '2b0267dc3671282a1498a92da7b38fd2ef5c018f':
  docs: Deprecate the old UI guidelines about Activity/Task and Menus

12 years agodocs: Deprecate the old UI guidelines about Activity/Task and Menus
Scott Main [Thu, 5 Apr 2012 19:34:33 +0000 (12:34 -0700)]
docs: Deprecate the old UI guidelines about Activity/Task and Menus

Change-Id: Ife0079ecd2285eca92833a8ff32e9b4545086448

12 years agoam ad606697: Removed HTML artifact from index page
Alexander Lucas [Thu, 5 Apr 2012 18:43:35 +0000 (11:43 -0700)]
am ad606697: Removed HTML artifact from index page

* commit 'ad6066970ae8f5979942178bcbbe90f72a348440':
  Removed HTML artifact from index page

12 years agoRemoved HTML artifact from index page
Alexander Lucas [Thu, 5 Apr 2012 18:29:27 +0000 (11:29 -0700)]
Removed HTML artifact from index page

Change-Id: Ibeef033ea2051a91056e53774345c48697f73a39

12 years agoam 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
Scott Main [Thu, 5 Apr 2012 00:50:24 +0000 (17:50 -0700)]
am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently

* commit '153f8fe420506a7e1b7a8f6b4d07db798867746e':
  docs: Android U: Displaying Bitmaps Efficiently

12 years agodocs: Android U: Displaying Bitmaps Efficiently
Scott Main [Thu, 5 Apr 2012 00:45:24 +0000 (17:45 -0700)]
docs: Android U: Displaying Bitmaps Efficiently

Change-Id: I749f6dd82438fc0902b892e9b918243fc0a826d3

12 years agoam e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into...
Trevor Johns [Wed, 4 Apr 2012 23:52:29 +0000 (16:52 -0700)]
am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1

* commit 'e07b58506579085b62fde0771b74111b24aa27a0':
  Docs: Fixing typo in "Testing from Other IDEs" article

12 years agoMerge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
Trevor Johns [Wed, 4 Apr 2012 23:51:18 +0000 (16:51 -0700)]
Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1

12 years agoDocs: Fixing typo in "Testing from Other IDEs" article
Trevor Johns [Wed, 4 Apr 2012 23:38:28 +0000 (16:38 -0700)]
Docs: Fixing typo in "Testing from Other IDEs" article

Fixing typo in Dev Guide article: 'android update-test-project'
should be 'android update test-project'.

Change-Id: Ie42a0b627d30d2a72fa081ca13bceaacdfd5aa03
http://developer.android.com/guide/developing/testing/testing_otheride.html

12 years agoam 624e02d6: am f336b9fc: Merge "Updated sample app for Android Training class: Makin...
Fred Chung [Wed, 4 Apr 2012 18:51:45 +0000 (11:51 -0700)]
am 624e02d6: am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1

* commit '624e02d6fdff70ef72653330cb233b2bf8c87fa6':
  Updated sample app for Android Training class: Making Your App Location Aware.

12 years agoam 99b44fdc: am f336b9fc: Merge "Updated sample app for Android Training class: Makin...
Fred Chung [Wed, 4 Apr 2012 18:51:12 +0000 (11:51 -0700)]
am 99b44fdc: am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1

* commit '99b44fdc87d3eac2feb17ab2409b0b66ca9333ba':
  Updated sample app for Android Training class: Making Your App Location Aware.

12 years agoam f336b9fc: Merge "Updated sample app for Android Training class: Making Your App...
Fred Chung [Wed, 4 Apr 2012 18:48:01 +0000 (11:48 -0700)]
am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1

* commit 'f336b9fce8b11c70b633bd71612544eaf2b9298b':
  Updated sample app for Android Training class: Making Your App Location Aware.

12 years agoam f336b9fc: Merge "Updated sample app for Android Training class: Making Your App...
Fred Chung [Wed, 4 Apr 2012 18:47:18 +0000 (11:47 -0700)]
am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1

* commit 'f336b9fce8b11c70b633bd71612544eaf2b9298b':
  Updated sample app for Android Training class: Making Your App Location Aware.

12 years agoMerge "Updated sample app for Android Training class: Making Your App Location Aware...
Fred Chung [Wed, 4 Apr 2012 18:45:21 +0000 (11:45 -0700)]
Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1

12 years agoam 7dc67f51: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigatio...
Roman Nurik [Wed, 4 Apr 2012 18:01:27 +0000 (11:01 -0700)]
am 7dc67f51: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1

* commit '7dc67f51272de42112d51a912c352ff2dc3aaf9c':

12 years agoam 32a035d1: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigatio...
Roman Nurik [Wed, 4 Apr 2012 17:58:53 +0000 (10:58 -0700)]
am 32a035d1: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1

* commit '32a035d165f43b72d961a71192c902eba581dd0e':
  docs: Android Design: v3 update (settings, navigation)

12 years agoam fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into...
Roman Nurik [Wed, 4 Apr 2012 17:57:24 +0000 (10:57 -0700)]
am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1

* commit 'fa840e2b9f7e8b5655fa262cd063800188dec216':
  docs: Android Design: v3 update (settings, navigation)

12 years agoam fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into...
Roman Nurik [Wed, 4 Apr 2012 17:55:55 +0000 (10:55 -0700)]
am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1

* commit 'fa840e2b9f7e8b5655fa262cd063800188dec216':
  docs: Android Design: v3 update (settings, navigation)

12 years agoMerge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
Roman Nurik [Wed, 4 Apr 2012 17:53:58 +0000 (10:53 -0700)]
Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1

12 years agoUpdated sample app for Android Training class: Making Your App Location Aware.
Fred Chung [Wed, 4 Apr 2012 17:53:34 +0000 (10:53 -0700)]
Updated sample app for Android Training class: Making Your App Location Aware.

Change-Id: I819a79b337bbdc33948c17cc5456e6406eb3bf98

12 years agodocs: Android Design: v3 update (settings, navigation)
Roman Nurik [Thu, 29 Mar 2012 20:28:13 +0000 (13:28 -0700)]
docs: Android Design: v3 update (settings, navigation)

Change-Id: I351e82561432f4357b52d2b7d99ae0fafdf79688

12 years agoam 4a219e6b: am a784b3de: Fix build break introduced by missing parenthesis in camera...
Jason Noguchi [Wed, 4 Apr 2012 00:35:14 +0000 (17:35 -0700)]
am 4a219e6b: am a784b3de: Fix build break introduced by missing parenthesis in camera stress test.

* commit '4a219e6b3c860050691bfc53e300a984c894fda5':

12 years agoam f5693a6a: am a784b3de: Fix build break introduced by missing parenthesis in camera...
Jason Noguchi [Wed, 4 Apr 2012 00:33:57 +0000 (17:33 -0700)]
am f5693a6a: am a784b3de: Fix build break introduced by missing parenthesis in camera stress test.

* commit 'f5693a6a50d2806ef5a4fd30929539e941dfa069':
  Fix build break introduced by missing parenthesis in camera stress test.

12 years agoam a784b3de: Fix build break introduced by missing parenthesis in camera stress test.
Jason Noguchi [Wed, 4 Apr 2012 00:31:00 +0000 (17:31 -0700)]
am a784b3de: Fix build break introduced by missing parenthesis in camera stress test.

* commit 'a784b3dea15dd0dfedfe25552b87fbb92a5eea52':
  Fix build break introduced by missing parenthesis in camera stress test.

12 years agoam a784b3de: Fix build break introduced by missing parenthesis in camera stress test.
Jason Noguchi [Wed, 4 Apr 2012 00:30:49 +0000 (17:30 -0700)]
am a784b3de: Fix build break introduced by missing parenthesis in camera stress test.

* commit 'a784b3dea15dd0dfedfe25552b87fbb92a5eea52':
  Fix build break introduced by missing parenthesis in camera stress test.

12 years agoFix build break introduced by missing parenthesis in camera stress test.
Jason Noguchi [Wed, 4 Apr 2012 00:01:50 +0000 (17:01 -0700)]
Fix build break introduced by missing parenthesis in camera stress test.

Change-Id: I8da9321a7674dbbe48cc0c214c0b043fbce8eeab

12 years agoam 9cb941d5: am 43562ecf: Merge "Creating new "Optimizing for TV" training." into...
Megha Joshi [Tue, 3 Apr 2012 23:15:35 +0000 (16:15 -0700)]
am 9cb941d5: am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1

* commit '9cb941d591ccc26f10846866112371572164410d':

12 years agoMerge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks...
Jason Noguchi [Tue, 3 Apr 2012 23:15:34 +0000 (16:15 -0700)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp

12 years agoam 5a894a35: am 43562ecf: Merge "Creating new "Optimizing for TV" training." into...
Megha Joshi [Tue, 3 Apr 2012 23:13:16 +0000 (16:13 -0700)]
am 5a894a35: am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1

* commit '5a894a35cc822aa1d12fd824815f91664c1237dd':
  Creating new "Optimizing for TV" training.

12 years agoam 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1
Megha Joshi [Tue, 3 Apr 2012 23:10:56 +0000 (16:10 -0700)]
am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1

* commit '43562ecf434092308765e2c31377c46612ba61bb':
  Creating new "Optimizing for TV" training.

12 years agoam 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1
Megha Joshi [Tue, 3 Apr 2012 23:10:28 +0000 (16:10 -0700)]
am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1

* commit '43562ecf434092308765e2c31377c46612ba61bb':
  Creating new "Optimizing for TV" training.

12 years agoMerge "Creating new "Optimizing for TV" training." into ics-mr1
Megha Joshi [Tue, 3 Apr 2012 23:08:29 +0000 (16:08 -0700)]
Merge "Creating new "Optimizing for TV" training." into ics-mr1

12 years agoCreating new "Optimizing for TV" training.
Megha Joshi [Mon, 26 Mar 2012 03:58:12 +0000 (20:58 -0700)]
Creating new "Optimizing for TV" training.

Change-Id: Id2f35e07460f4c900facd364631a09c369b45310

12 years agoam 9e88e82e: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress...
Jason Noguchi [Tue, 3 Apr 2012 22:37:15 +0000 (15:37 -0700)]
am 9e88e82e: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1

* commit '9e88e82e9ba2938263212f63c5021a904740a690':
  Adding camera zoom test to mediaframework stress suite.

12 years agoMerge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks...
Scott Main [Tue, 3 Apr 2012 22:37:14 +0000 (15:37 -0700)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp

12 years agoam 34a4e519: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress...
Jason Noguchi [Tue, 3 Apr 2012 22:36:32 +0000 (15:36 -0700)]
am 34a4e519: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1

* commit '34a4e519b298941760c1d6797142a9ebca003627':
  Adding camera zoom test to mediaframework stress suite.

12 years agoam 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into...
Jason Noguchi [Tue, 3 Apr 2012 22:32:47 +0000 (15:32 -0700)]
am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1

* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.

12 years agoam 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into...
Jason Noguchi [Tue, 3 Apr 2012 22:32:34 +0000 (15:32 -0700)]
am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1

* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.

12 years agoMerge "Adding camera zoom test to mediaframework stress suite." into ics-mr1
Jason Noguchi [Tue, 3 Apr 2012 22:30:22 +0000 (15:30 -0700)]
Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1

12 years agoam ad5789c6: am c70e89e2: Fix hybrid build
Chris Craik [Tue, 3 Apr 2012 22:28:22 +0000 (15:28 -0700)]
am ad5789c6: am c70e89e2: Fix hybrid build

* commit 'ad5789c6dcad930f1fce34685b7ca84df4d68e90':
  Fix hybrid build

12 years agoam c70e89e2: Fix hybrid build
Chris Craik [Tue, 3 Apr 2012 22:24:37 +0000 (15:24 -0700)]
am c70e89e2: Fix hybrid build

* commit 'c70e89e2a024645d425b49db2bbf3f20ed68e518':
  Fix hybrid build

12 years agoFix hybrid build
Chris Craik [Tue, 3 Apr 2012 20:53:46 +0000 (13:53 -0700)]
Fix hybrid build

Change-Id: Ieef556473e1878d1319f9844fb0bbb974637999e

12 years agoam ac15e96e: am 0687c830: Merge "docs: change markup for "new" tags to avoid the...
Scott Main [Tue, 3 Apr 2012 21:03:39 +0000 (14:03 -0700)]
am ac15e96e: am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1

* commit 'ac15e96e49db31d80a8c11c1236d2d5fe3ba429e':
  docs: change markup for "new" tags to avoid the new tags wraping solo

12 years agoam 2449b2eb: am 0687c830: Merge "docs: change markup for "new" tags to avoid the...
Scott Main [Tue, 3 Apr 2012 21:03:32 +0000 (14:03 -0700)]
am 2449b2eb: am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1

* commit '2449b2eb84f75e0bee366f9646d0863daa966b83':
  docs: change markup for "new" tags to avoid the new tags wraping solo

12 years agoam 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping...
Scott Main [Tue, 3 Apr 2012 21:00:17 +0000 (14:00 -0700)]
am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1

* commit '0687c83032219656fa4ff64ca28dd28fd15ca748':
  docs: change markup for "new" tags to avoid the new tags wraping solo

12 years agoam 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping...
Scott Main [Tue, 3 Apr 2012 20:59:46 +0000 (13:59 -0700)]
am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1

* commit '0687c83032219656fa4ff64ca28dd28fd15ca748':
  docs: change markup for "new" tags to avoid the new tags wraping solo

12 years agoMerge "docs: change markup for "new" tags to avoid the new tags wraping solo" into...
Scott Main [Tue, 3 Apr 2012 20:58:16 +0000 (13:58 -0700)]
Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1

12 years agodocs: change markup for "new" tags to avoid the new tags wraping solo
Scott Main [Tue, 3 Apr 2012 20:25:47 +0000 (13:25 -0700)]
docs: change markup for "new" tags to avoid the new tags wraping solo

Change-Id: If88d3cc173080db101ea5af9dc728653a2176a46

12 years agoam 0249e6c4: am 04a73fb6: Merge "Android Training: Making Your App Location Aware...
Fred Chung [Tue, 3 Apr 2012 20:23:29 +0000 (13:23 -0700)]
am 0249e6c4: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1

* commit '0249e6c4f9083206c1ab280dfa149a65bf931b7e':

12 years agoam 274fb3c6: am 04a73fb6: Merge "Android Training: Making Your App Location Aware...
Fred Chung [Tue, 3 Apr 2012 20:21:15 +0000 (13:21 -0700)]
am 274fb3c6: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1

* commit '274fb3c68077fcf710f8f9c165681265af4ffcd7':
  Android Training: Making Your App Location Aware

12 years agoam 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1
Fred Chung [Tue, 3 Apr 2012 20:18:59 +0000 (13:18 -0700)]
am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1

* commit '04a73fb65c7fc6e8a02db98ea38ed722f60e9222':
  Android Training: Making Your App Location Aware

12 years agoam 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1
Fred Chung [Tue, 3 Apr 2012 20:18:16 +0000 (13:18 -0700)]
am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1

* commit '04a73fb65c7fc6e8a02db98ea38ed722f60e9222':
  Android Training: Making Your App Location Aware

12 years agoMerge "Android Training: Making Your App Location Aware" into ics-mr1
Fred Chung [Tue, 3 Apr 2012 20:16:42 +0000 (13:16 -0700)]
Merge "Android Training: Making Your App Location Aware" into ics-mr1

12 years agoAndroid Training: Making Your App Location Aware
Fred Chung [Fri, 30 Mar 2012 02:08:49 +0000 (19:08 -0700)]
Android Training: Making Your App Location Aware

Change-Id: I7091f1fd10707c0397fe0d8bc066d38dcd5174ec

12 years agoam 2095427d: am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibilit...
Joe Fernandez [Tue, 3 Apr 2012 17:13:38 +0000 (10:13 -0700)]
am 2095427d: am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1

* commit '2095427d1b81284d4ffff3de768122d08c2309fe':

12 years agoam c31f6b96: am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1
Alexander Lucas [Tue, 3 Apr 2012 17:09:47 +0000 (10:09 -0700)]
am c31f6b96: am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1

* commit 'c31f6b96bd8e9d91085e862313f63a73c356516e':

12 years agoam b459b619: am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibilit...
Joe Fernandez [Tue, 3 Apr 2012 17:08:09 +0000 (10:08 -0700)]
am b459b619: am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1

* commit 'b459b619b389f999564c3c526fe703e0c966ed9b':
  docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)

12 years agoam 7c8d5574: am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1
Alexander Lucas [Tue, 3 Apr 2012 17:08:07 +0000 (10:08 -0700)]
am 7c8d5574: am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1

* commit '7c8d55747a408d5d0594ce0198817e4dadf10ae0':
  initial accessibility class commit

12 years agoam 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practi...
Joe Fernandez [Tue, 3 Apr 2012 17:07:29 +0000 (10:07 -0700)]
am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1

* commit '945b7cb324f3bdfcf13efbe7bdf6a60f7163ed9a':
  docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)

12 years agoam 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practi...
Joe Fernandez [Tue, 3 Apr 2012 17:04:54 +0000 (10:04 -0700)]
am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1

* commit '945b7cb324f3bdfcf13efbe7bdf6a60f7163ed9a':
  docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)

12 years agoam 95dc3b50: Merge "initial accessibility class commit" into ics-mr1
Alexander Lucas [Tue, 3 Apr 2012 17:04:52 +0000 (10:04 -0700)]
am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1

* commit '95dc3b50fc2726959850efd64f47a78cb30fc090':
  initial accessibility class commit

12 years agoam 95dc3b50: Merge "initial accessibility class commit" into ics-mr1
Alexander Lucas [Tue, 3 Apr 2012 17:04:41 +0000 (10:04 -0700)]
am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1

* commit '95dc3b50fc2726959850efd64f47a78cb30fc090':
  initial accessibility class commit

12 years agoMerge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into...
Joe Fernandez [Tue, 3 Apr 2012 17:03:35 +0000 (10:03 -0700)]
Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1

12 years agoMerge "initial accessibility class commit" into ics-mr1
Alexander Lucas [Tue, 3 Apr 2012 17:02:48 +0000 (10:02 -0700)]
Merge "initial accessibility class commit" into ics-mr1

12 years agoam 3003a1b1: am 660b2d97: Merge "docs: NDK r7c Release Notes (RC2)" into ics-mr1
Joe Fernandez [Tue, 3 Apr 2012 00:31:17 +0000 (17:31 -0700)]
am 3003a1b1: am 660b2d97: Merge "docs: NDK r7c Release Notes (RC2)" into ics-mr1

* commit '3003a1b130d2cf58703a5841d11bac6812eaa138':

12 years agoam 717a4615: am 2c015353: Merge "docs: SDK r18 + 4.0.4 system image Release Notes...
Joe Fernandez [Tue, 3 Apr 2012 00:31:11 +0000 (17:31 -0700)]
am 717a4615: am 2c015353: Merge "docs: SDK r18 + 4.0.4 system image Release Notes (RC1)" into ics-mr1

* commit '717a4615149819a49aef3c99808df7f5091a547c':

12 years agoam 1b9cec8b: am 660b2d97: Merge "docs: NDK r7c Release Notes (RC2)" into ics-mr1
Joe Fernandez [Tue, 3 Apr 2012 00:27:56 +0000 (17:27 -0700)]
am 1b9cec8b: am 660b2d97: Merge "docs: NDK r7c Release Notes (RC2)" into ics-mr1

* commit '1b9cec8bc4ec1a15468c544994d7ffdcb68ef408':
  docs: NDK r7c Release Notes (RC2)