OSDN Git Service
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
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
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
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
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
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
Robert Ly [Tue, 10 Apr 2012 21:24:00 +0000 (14:24 -0700)]
Merge "docs: fixing broken link for bug
6104366" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:23:50 +0000 (14:23 -0700)]
Merge "docs: fixing ndk bug
5991108" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:23:37 +0000 (14:23 -0700)]
Merge "docs: fixing renderscript doc bug
6111834" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 20:30:45 +0000 (13:30 -0700)]
docs: fixing ndk bug
5991108
Change-Id: I70b5505fc424b278ea8977955857c92082a1f828
Robert Ly [Tue, 10 Apr 2012 20:20:44 +0000 (13:20 -0700)]
docs: fixing broken link for bug
6104366
Change-Id: Ic8f7a9c5540cc0dd2251b7373e80b1f9ab6d8aa9
Robert Ly [Tue, 10 Apr 2012 17:57:33 +0000 (10:57 -0700)]
docs: fixing renderscript doc bug
6111834
Change-Id: Iea6fdaf03a0064462d57e4b62500ad689ba2b824
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
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
Teng-Hui Zhu [Mon, 9 Apr 2012 21:51:48 +0000 (14:51 -0700)]
Update SurfaceTexture interface for forward compatibility
Change-Id: I32d224428c0127800714a976b4d7bb68cc7c2464
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':
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
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
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
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
Scott Main [Mon, 2 Apr 2012 20:11:23 +0000 (13:11 -0700)]
docs: Add 101 class about supporting various devices
Change-Id: Iafeb99c9dab8462236a41cc4991085062ff7fa14
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':
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
Scott Main [Mon, 9 Apr 2012 22:24:13 +0000 (15:24 -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
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
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
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':
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
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
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
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
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
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':
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"
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"
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"
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
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
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':
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)
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)
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)
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
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':
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':
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':
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':
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
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
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
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
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
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
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
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
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
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
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
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
Alexander Lucas [Thu, 5 Apr 2012 18:29:27 +0000 (11:29 -0700)]
Removed HTML artifact from index page
Change-Id: Ibeef033ea2051a91056e53774345c48697f73a39
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
Scott Main [Thu, 5 Apr 2012 00:45:24 +0000 (17:45 -0700)]
docs: Android U: Displaying Bitmaps Efficiently
Change-Id: I749f6dd82438fc0902b892e9b918243fc0a826d3
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
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
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
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.
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.
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.
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.
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
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':
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)
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)
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)
Roman Nurik [Wed, 4 Apr 2012 17:53:58 +0000 (10:53 -0700)]
Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
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
Roman Nurik [Thu, 29 Mar 2012 20:28:13 +0000 (13:28 -0700)]
docs: Android Design: v3 update (settings, navigation)
Change-Id: I351e82561432f4357b52d2b7d99ae0fafdf79688
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':
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.
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.
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.
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
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':
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
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.
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.
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.
Megha Joshi [Tue, 3 Apr 2012 23:08:29 +0000 (16:08 -0700)]
Merge "Creating new "Optimizing for TV" training." into ics-mr1
Megha Joshi [Mon, 26 Mar 2012 03:58:12 +0000 (20:58 -0700)]
Creating new "Optimizing for TV" training.
Change-Id: Id2f35e07460f4c900facd364631a09c369b45310
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.
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
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.
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.
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.
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
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
Chris Craik [Tue, 3 Apr 2012 22:24:37 +0000 (15:24 -0700)]
am
c70e89e2: Fix hybrid build
* commit '
c70e89e2a024645d425b49db2bbf3f20ed68e518':
Fix hybrid build
Chris Craik [Tue, 3 Apr 2012 20:53:46 +0000 (13:53 -0700)]
Fix hybrid build
Change-Id: Ieef556473e1878d1319f9844fb0bbb974637999e
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
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