OSDN Git Service
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
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
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 17:57:33 +0000 (10:57 -0700)]
docs: fixing renderscript doc bug
6111834
Change-Id: Iea6fdaf03a0064462d57e4b62500ad689ba2b824
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 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 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: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: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: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:29:36 +0000 (15:29 -0700)]
docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
Change-Id: I561e805b2d48910ddf66432f6df40086fe59c597
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: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: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 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: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: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: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: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: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: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
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
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
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
Fred Chung [Tue, 3 Apr 2012 20:16:42 +0000 (13:16 -0700)]
Merge "Android Training: Making Your App Location Aware" into ics-mr1
Fred Chung [Fri, 30 Mar 2012 02:08:49 +0000 (19:08 -0700)]
Android Training: Making Your App Location Aware
Change-Id: I7091f1fd10707c0397fe0d8bc066d38dcd5174ec
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)
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
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
Alexander Lucas [Tue, 3 Apr 2012 17:02:48 +0000 (10:02 -0700)]
Merge "initial accessibility class commit" into ics-mr1
Alexander Lucas [Wed, 7 Mar 2012 02:13:07 +0000 (18:13 -0800)]
initial accessibility class commit
Change-Id: Ib3b8f6e8f70f856e4bb9aae60b5d58d0f3e320be
Joe Fernandez [Tue, 3 Apr 2012 00:23:46 +0000 (17:23 -0700)]
am
660b2d97: Merge "docs: NDK r7c Release Notes (RC2)" into ics-mr1
* commit '
660b2d97ffd9c5427fdf36bd42e161f8fc93ac3e':
docs: NDK r7c Release Notes (RC2)
Joe Fernandez [Tue, 3 Apr 2012 00:23:44 +0000 (17:23 -0700)]
am
2c015353: Merge "docs: SDK r18 + 4.0.4 system image Release Notes (RC1)" into ics-mr1
* commit '
2c0153539a01d63bcc04e73ab46237bec9a7868b':
docs: SDK r18 + 4.0.4 system image Release Notes (RC1)
Joe Fernandez [Tue, 3 Apr 2012 00:20:10 +0000 (17:20 -0700)]
am
1cbd69fb: Merge "docs: Fix for jarsigner and JDK7; specify signature and digest algorithim" into ics-mr1
* commit '
1cbd69fbab476bc65f38fd7e871a02299ced669a':
docs: Fix for jarsigner and JDK7; specify signature and digest algorithim
Joe Fernandez [Tue, 3 Apr 2012 00:19:25 +0000 (17:19 -0700)]
Merge "docs: NDK r7c Release Notes (RC2)" into ics-mr1
Joe Fernandez [Tue, 3 Apr 2012 00:19:06 +0000 (17:19 -0700)]
Merge "docs: SDK r18 + 4.0.4 system image Release Notes (RC1)" into ics-mr1
Joe Fernandez [Tue, 3 Apr 2012 00:17:45 +0000 (17:17 -0700)]
Merge "docs: Fix for jarsigner and JDK7; specify signature and digest algorithim" into ics-mr1
Joe Fernandez [Mon, 26 Mar 2012 18:50:13 +0000 (11:50 -0700)]
docs: SDK r18 + 4.0.4 system image Release Notes (RC1)
Change-Id: Iee4a96acf1b86e02e1836801e63b01a357416777
Joe Fernandez [Mon, 12 Mar 2012 08:00:18 +0000 (01:00 -0700)]
docs: NDK r7c Release Notes (RC2)
Change-Id: I687e21bd2d85abbe1bca58396830a9cc23007444
Joe Fernandez [Thu, 29 Mar 2012 18:36:23 +0000 (11:36 -0700)]
docs: Fix for jarsigner and JDK7; specify signature and digest algorithim
Change-Id: Ia44bb209a9a3ace83dfe10ca4669c15ddd7f4caf
Scott Main [Mon, 2 Apr 2012 18:42:01 +0000 (11:42 -0700)]
am
dfa3b8fa: docs: dashboard update for 4/2
* commit '
dfa3b8fa4a3cb48877be364749a37acc9f08721b':
docs: dashboard update for 4/2
Scott Main [Mon, 2 Apr 2012 18:14:23 +0000 (11:14 -0700)]
docs: dashboard update for 4/2
Change-Id: Id5fd6c7eaa80bba1ebea58fb7df762ea2635130d
Scott Main [Mon, 2 Apr 2012 16:23:45 +0000 (09:23 -0700)]
am
6a273f0d: Merge "docs: de-new a bunch of docs" into ics-mr1
* commit '
6a273f0d045951552263b1b66c34d29929c5a282':
docs: de-new a bunch of docs
Scott Main [Mon, 2 Apr 2012 16:21:45 +0000 (09:21 -0700)]
Merge "docs: de-new a bunch of docs" into ics-mr1
Tony Chan [Sat, 31 Mar 2012 09:15:15 +0000 (02:15 -0700)]
am
4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1
* commit '
4ddfaeb5fe29d5dd3dbfd525e97723a972ea5a65':
sdk doc change: Added KeyChain API Demo
Tony Chan [Sat, 31 Mar 2012 09:13:45 +0000 (02:13 -0700)]
Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1
Scott Main [Fri, 30 Mar 2012 17:29:33 +0000 (10:29 -0700)]
docs: de-new a bunch of docs
Change-Id: I5ff761b6fe4958f8ef67fb2fa7af81c3e81cbda6
Tony Chan [Wed, 28 Mar 2012 17:33:08 +0000 (01:33 +0800)]
sdk doc change: Added KeyChain API Demo
Change-Id: I8ea879bf30f933c745e33dafa6591fce77251eb6
Joe Malin [Thu, 29 Mar 2012 20:29:19 +0000 (13:29 -0700)]
am
6a04325d: DOC CHANGE: Spell Checker article
* commit '
6a04325d5d54e1e51b47c86b7386c355e4eb2191':
DOC CHANGE: Spell Checker article
Joe Malin [Thu, 15 Mar 2012 01:24:43 +0000 (18:24 -0700)]
DOC CHANGE: Spell Checker article
Change-Id: I839fc46cc58d68537bbdc0e3433c6329cdab2b04
Joe Fernandez [Mon, 6 Feb 2012 22:30:15 +0000 (14:30 -0800)]
docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)
Change-Id: Id7e3f647042d2afd390abe851be1c3b561af33ca
Scott Main [Mon, 26 Mar 2012 23:44:47 +0000 (16:44 -0700)]
am
bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
* commit '
bd26ba4871078aa85024320040de35995e90924b':
docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs
Scott Main [Mon, 26 Mar 2012 23:43:03 +0000 (16:43 -0700)]
Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
Scott Main [Thu, 15 Mar 2012 00:16:11 +0000 (17:16 -0700)]
docs: update SDK and AVD Manager strings; update android tool doc
and update another AVD manager screenshot
and finally change "component" to "package" for SDK manager docs
Change-Id: Iae7de7c0264d0cdff4fba0920e50e4637bcf90e0
Scott Main [Mon, 26 Mar 2012 21:43:59 +0000 (14:43 -0700)]
am
af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
* commit '
af9a26b21262500c5f864bcd82bc14ee805fdaac':
docs: replace the "Contribute" message with "Design"
Scott Main [Mon, 26 Mar 2012 21:42:22 +0000 (14:42 -0700)]
Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
Scott Main [Mon, 26 Mar 2012 21:30:01 +0000 (14:30 -0700)]
am
7fa4a28e: docs: add Coolpad to oem driver list
* commit '
7fa4a28e1e37cb66d28dc16b7128da1fba01da0e':
docs: add Coolpad to oem driver list
Scott Main [Mon, 26 Mar 2012 21:25:01 +0000 (14:25 -0700)]
docs: replace the "Contribute" message with "Design"
Change-Id: I38c5990b3b5ee6538197c59671cec7adeadea913
Scott Main [Mon, 26 Mar 2012 19:12:24 +0000 (12:12 -0700)]
docs: add Coolpad to oem driver list
Change-Id: I0cb6267a35d9a691c6cacea471a9fca9d5dc61b8
Joe Malin [Sun, 25 Mar 2012 20:04:59 +0000 (13:04 -0700)]
am
093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1
* commit '
093ed3838c3f2847be1893ea49c6b15b90e0afc3':
DOC CHANGE: IME subtype article
Joe Malin [Sun, 25 Mar 2012 20:02:53 +0000 (13:02 -0700)]
Merge "DOC CHANGE: IME subtype article" into ics-mr1
Reto Meier [Fri, 23 Mar 2012 20:30:04 +0000 (13:30 -0700)]
am
20f394df: Docs: Added efficient downloads Android U class
* commit '
20f394df4db02c492d7920f4f366b777451c2067':
Docs: Added efficient downloads Android U class
Reto Meier [Wed, 14 Mar 2012 16:27:11 +0000 (09:27 -0700)]
Docs: Added efficient downloads Android U class
Change-Id: I2a9484c5a224a7e0688fbd9afb16246db8f3ddf9
Joe Malin [Sat, 10 Mar 2012 00:04:35 +0000 (16:04 -0800)]
DOC CHANGE: IME subtype article
Change-Id: Ie7addcc6155c275b247e15787fe226b43b0dee1a
Jason Noguchi [Tue, 21 Feb 2012 23:09:48 +0000 (15:09 -0800)]
Adding camera zoom test to mediaframework stress suite.
Change-Id: I3ee72156f42cf189ff1d0bd469f83b938a6b87ff
Andrew Hsieh [Thu, 22 Mar 2012 17:18:59 +0000 (10:18 -0700)]
am
3347d659: am
1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '
3347d6597bd6214f037825e41be7e58198d9079d':
Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
Andrew Hsieh [Thu, 22 Mar 2012 17:16:42 +0000 (10:16 -0700)]
am
1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '
1f9e749914c7c636bd759da0209e68d5801407ac':
Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
Andrew Hsieh [Tue, 13 Mar 2012 07:55:34 +0000 (00:55 -0700)]
Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
It's needed to build four shared libraries in 64-bit for 64-bit
emulator with "-gpu on"
lib64OpenglRender.so
lib64EGL_translator.so
lib64GLES_CM_translator.so
lib64GLES_V2_translator.so
Change-Id: Ia6c05b23df1e9cd9e7f2e94e4cd5bde4be5d336b
Joe Fernandez [Wed, 21 Mar 2012 23:43:33 +0000 (16:43 -0700)]
am
66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit '
66f1bafb2326e12814df703a4285373e8651a3ce':
docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
Joe Fernandez [Wed, 21 Mar 2012 23:41:19 +0000 (16:41 -0700)]
Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
Joe Fernandez [Wed, 21 Mar 2012 23:25:21 +0000 (16:25 -0700)]
docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
Change-Id: Id10c2d5eec9f81d1c6ce52067b7e25b7f411d91c
The Android Open Source Project [Wed, 21 Mar 2012 15:23:03 +0000 (08:23 -0700)]
Reconcile with ics-mr1-release
Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a
Jim Miller [Tue, 20 Mar 2012 22:30:43 +0000 (15:30 -0700)]
Fix
5960562: Show emergency button on PukUnlock screen
This fixes an issue where the device doesn't show the emergency button
on the SIM PUK unlock screen. The problem was introduced in I3127bfd5
where we allowed the button to be conditionally shown.
Change-Id: I3e2aae2bce89399a2564c3f8a726a8db99cdec86
Jim Miller [Tue, 20 Mar 2012 23:41:56 +0000 (16:41 -0700)]
am
928d3470: Fix
5960562: Show emergency button on PukUnlock screen
* commit '
928d34704b96db9133e28dc77b716518d335b356':
Fix
5960562: Show emergency button on PukUnlock screen
Jim Miller [Tue, 20 Mar 2012 22:30:43 +0000 (15:30 -0700)]
Fix
5960562: Show emergency button on PukUnlock screen
This fixes an issue where the device doesn't show the emergency button
on the SIM PUK unlock screen. The problem was introduced in I3127bfd5
where we allowed the button to be conditionally shown.
Change-Id: I3e2aae2bce89399a2564c3f8a726a8db99cdec86
OSDN Git Service
