OSDN Git Service
Amith Yamasani [Fri, 18 Jan 2013 19:04:09 +0000 (11:04 -0800)]
Properly initialize recognition service if the recognizer component changed.
The getServiceInfo() call directly to IPackageManager does not throw an exception.
The return value needed to be checked for null.
Bug:
8031032
Change-Id: I701b9e8cf3b2406a3b35a486183330489b3d46f5
Victoria Lease [Fri, 18 Jan 2013 18:42:36 +0000 (18:42 +0000)]
Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev
Robert Ly [Fri, 18 Jan 2013 18:23:29 +0000 (10:23 -0800)]
am
548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
* commit '
548e17dfdbd862cdfc663268a6d67b47f42b9544':
docs: Add PageTransformer to animations training class
Robert Ly [Fri, 18 Jan 2013 18:20:29 +0000 (18:20 +0000)]
Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
Roman Nurik [Wed, 9 Jan 2013 16:35:53 +0000 (08:35 -0800)]
docs: Add PageTransformer to animations training class
Change-Id: I01f7e5b1fa078d9219edf190e5e8444192cc55f1
Andy McFadden [Thu, 17 Jan 2013 20:09:40 +0000 (12:09 -0800)]
am
9b6687bb: Fix code snippet
* commit '
9b6687bbc6a3e2866fdfd8ac3c725138d4c7ecbf':
Fix code snippet
Andy McFadden [Tue, 15 Jan 2013 20:26:04 +0000 (12:26 -0800)]
Fix code snippet
One of the examples was incorrect (both here and in the original).
http://b.android.com/42776
Change-Id: I2a218b724f50caf47d5185ef529ae8ab3104794f
Victoria Lease [Wed, 16 Jan 2013 20:51:04 +0000 (12:51 -0800)]
DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03
Conflicts:
services/java/com/android/server/ServiceWatcher.java
Dirk Dougherty [Thu, 17 Jan 2013 00:37:03 +0000 (16:37 -0800)]
am
3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
* commit '
3987f6c1793bd44305c491e9b57134a1df285599':
Doc change: Fix urls to work properly with https.
Dirk Dougherty [Thu, 17 Jan 2013 00:30:09 +0000 (00:30 +0000)]
Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
Scott Kennedy [Wed, 16 Jan 2013 18:08:08 +0000 (10:08 -0800)]
am
d7ec742c: docs: Minor typos
* commit '
d7ec742c30be95da4d20930dd5000897bfe3f127':
docs: Minor typos
Dirk Dougherty [Wed, 16 Jan 2013 03:57:25 +0000 (19:57 -0800)]
Doc change: Fix urls to work properly with https.
Change-Id: I8bc996dff0a0b44992987f93019a2a5be40430cd
Scott Kennedy [Wed, 16 Jan 2013 03:33:56 +0000 (19:33 -0800)]
docs: Minor typos
One of these was mentioned in a comment in external 40435
Change-Id: I70f41214f41a91c716d642fe389ac2d3000175f4
Scott Main [Tue, 15 Jan 2013 23:25:04 +0000 (15:25 -0800)]
am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
3c3995f5ab2d0bc38cd06effdd65395a6a9a0ac3':
docs: put new devbytes playlist on the develop landing
Scott Main [Tue, 15 Jan 2013 23:20:23 +0000 (15:20 -0800)]
Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
Scott Kennedy [Tue, 15 Jan 2013 22:29:20 +0000 (14:29 -0800)]
am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
335da367a167d11eefb9d8127b9423093213bcc8':
docs: Another fix for external 42607
Scott Kennedy [Tue, 15 Jan 2013 22:24:24 +0000 (14:24 -0800)]
Merge "docs: Another fix for external 42607" into jb-mr1-dev
Scott Main [Tue, 15 Jan 2013 19:18:48 +0000 (11:18 -0800)]
docs: put new devbytes playlist on the develop landing
Change-Id: I7a9c936502a7d5caaa2d0588af3cbb1c790cc288
Scott Main [Tue, 15 Jan 2013 19:11:16 +0000 (11:11 -0800)]
am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
ec171f3f48f49cffc49bf36d2d65a76489351034':
docs: add download ZIPs for chet's devbyte samples
Scott Main [Tue, 15 Jan 2013 19:03:49 +0000 (11:03 -0800)]
docs: add download ZIPs for chet's devbyte samples
Change-Id: I06ec87729afe2c5b161ae7877f2cc012db60db2f
Xavier Ducrohet [Tue, 15 Jan 2013 18:49:12 +0000 (10:49 -0800)]
am
de3b69e0: Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev
* commit '
de3b69e0512c00158333a223f6c53c9eac7b3d34':
Fix the single crunch command to return the right error code.
Xavier Ducrohet [Tue, 15 Jan 2013 18:45:28 +0000 (10:45 -0800)]
Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev
Xavier Ducrohet [Tue, 15 Jan 2013 02:02:40 +0000 (18:02 -0800)]
Fix the single crunch command to return the right error code.
Casting from status_t to int doesn't work for return values
if the lower 8 bits are all 0.
Change-Id: I88e910dfe46cb72acd1595352e71da3c8eff4ca9
Scott Kennedy [Tue, 15 Jan 2013 16:52:37 +0000 (08:52 -0800)]
docs: Another fix for external 42607
Follow-up to If4215cef850ba8e4e8df356a68192566806e7914
Change-Id: I70a7a9f6a5be654b1fab9645c87da304b33aec5b
Dirk Dougherty [Tue, 15 Jan 2013 05:24:16 +0000 (21:24 -0800)]
am
20d47ca8: Doc change: add developer video to carousel and spotlight pages.
* commit '
20d47ca81df71096fd74bc9205e0e2a744cb630a':
Doc change: add developer video to carousel and spotlight pages.
Dirk Dougherty [Tue, 15 Jan 2013 01:42:30 +0000 (17:42 -0800)]
Doc change: add developer video to carousel and spotlight pages.
Change-Id: Ia12eb98f4d86edea72dfa1142d782ea24d3373f7
Xia Wang [Mon, 14 Jan 2013 23:00:38 +0000 (15:00 -0800)]
am
d1a18011: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev
* commit '
d1a18011a68b2cac907d080d9044d527fd4c5853':
Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks.
Xia Wang [Mon, 14 Jan 2013 22:56:46 +0000 (14:56 -0800)]
Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev
Xia Wang [Wed, 21 Nov 2012 03:03:06 +0000 (19:03 -0800)]
Fix image processing test to include all benchmark tests
-- each test case can be excuted separately
-- add a test case to run all benchmarks.
DO NOT MERGE
Change-Id: I3c61dfe50267a6db11bc1895a4f37ed618a9103b
Scott Kennedy [Mon, 14 Jan 2013 19:09:27 +0000 (11:09 -0800)]
am
08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '
083426980dbe6607a0cfc8b4ec5944d5b414ecbe':
docs: Fix a bunch of issues
Scott Kennedy [Mon, 14 Jan 2013 19:05:46 +0000 (11:05 -0800)]
Merge "docs: Fix a bunch of issues" into jb-mr1-dev
Scott Main [Mon, 14 Jan 2013 18:25:38 +0000 (10:25 -0800)]
am
07ee7d17: docs: Hide Arabic and Hebrew badges due to translation problems
* commit '
07ee7d17ac9e045bdbc08290df3275bbb4013e33':
docs: Hide Arabic and Hebrew badges due to translation problems
Scott Main [Mon, 14 Jan 2013 18:16:59 +0000 (10:16 -0800)]
docs: Hide Arabic and Hebrew badges due to translation problems
Change-Id: I0257b19bb08348bef5ddb500f00a165255e473f8
Adam Koch [Mon, 14 Jan 2013 14:15:20 +0000 (06:15 -0800)]
am
6f680f52: Displaying Bitmaps Efficiently Training - Change memory calculation
* commit '
6f680f524a66dabcf0d86d0f19f3855f8c5e594f':
Displaying Bitmaps Efficiently Training - Change memory calculation
Scott Kennedy [Sat, 12 Jan 2013 06:31:43 +0000 (22:31 -0800)]
docs: Fix a bunch of issues
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441
Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
Adam Koch [Fri, 11 Jan 2013 21:53:37 +0000 (16:53 -0500)]
Displaying Bitmaps Efficiently Training - Change memory calculation
When calculating memory cache size, use Runtime.maxMemory() instead
of getMemoryClass() which is a more accurate value of available VM
heap size.
Bug:
7988323
Change-Id: Iaa9681a11aad5cad3857dfe76f0b8e4811b2243c
Satoshi Kataoka [Fri, 11 Jan 2013 02:12:43 +0000 (18:12 -0800)]
Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
Sascha Prueter [Thu, 10 Jan 2013 19:11:20 +0000 (11:11 -0800)]
Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev
Jeff Brown [Thu, 10 Jan 2013 02:46:37 +0000 (18:46 -0800)]
Improve heuristics for detecting wireless chargers.
On some devices, we need to apply heuristics to determine whether
the device is docked on a wireless charger because the charging
circuits do not provide sufficient information to know whether
the device is on the charger unless it is actually receiving
power.
The previous heuristics only considered the battery level to
suppress spurious dock signals.
The new heuristics also take into account whether the device
appears to have moved from its previous position on the dock.
Bug:
7744185
Change-Id: I5ba885dac25b37840b6db46b8a0f30968a06776c
Adam Koch [Thu, 10 Jan 2013 14:26:46 +0000 (06:26 -0800)]
am
0bb4dade: Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
* commit '
0bb4dade30d3413cc7951c5d2c0ee761a93ae468':
Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
Satoshi Kataoka [Thu, 10 Jan 2013 07:44:28 +0000 (23:44 -0800)]
Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
This reverts commit
32b812054cce27d1c70b53ba8ac729c7186b105e
Bug:
7976890
Change-Id: I75ab60734153719b199cf7281d23f5eb1ad2d1bc
Dianne Hackborn [Thu, 10 Jan 2013 02:31:37 +0000 (18:31 -0800)]
Merge from master: fix issue #
7966357: Super lights out mode vs. volume dialog
The volume panel now forces us out of the UI modes while it
is up.
Change-Id: If39fa33b1c52579bf5d376ce4722408cee3ca951
Adam Koch [Wed, 9 Jan 2013 21:58:59 +0000 (16:58 -0500)]
Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
When computing inSampleSize, calculateInSampleSize() needs to compare
height/width ratios, rather than raw values.
Bug:
7951398
Change-Id: I207f9abc2aae4cc569b406bac237e221d8e64d1e
Adam Powell [Wed, 9 Jan 2013 19:19:22 +0000 (11:19 -0800)]
Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev
Scott Main [Wed, 9 Jan 2013 04:13:40 +0000 (20:13 -0800)]
am
cdf5106a: docs: a few doc bugs
* commit '
cdf5106aafb77d17584d5401b207cbcc7a20f5f3':
docs: a few doc bugs
Scott Main [Wed, 9 Jan 2013 04:03:05 +0000 (20:03 -0800)]
docs: a few doc bugs
Change-Id: I20d2ff2f3abfe674ca20f713c7213ee031c9bb1d
Adam Powell [Wed, 9 Jan 2013 03:26:21 +0000 (19:26 -0800)]
Make action bar title a valid touch target for up when relevant
arubin bug
7966136
Change-Id: Iea5b85852cc1664f1390a6f8b6179d63b50857e4
Scott Main [Tue, 8 Jan 2013 22:27:34 +0000 (14:27 -0800)]
am
d149242a: docs: correct the url path to badge images and updated pr-br badge
* commit '
d149242afc5aab745b5bbde0b67d6c333a5d685f':
docs: correct the url path to badge images and updated pr-br badge
Scott Main [Tue, 8 Jan 2013 21:58:56 +0000 (13:58 -0800)]
docs: correct the url path to badge images
and updated pr-br badge
Change-Id: I23369b5f306f584714742dc4b58a47d7071805be
Scott Main [Tue, 8 Jan 2013 20:42:10 +0000 (12:42 -0800)]
am
70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev
* commit '
70af3cdb90bafc081ffa693a350b95ced48b6cfd':
docs: resolve bugs from external tracker
Scott Main [Tue, 8 Jan 2013 20:34:26 +0000 (12:34 -0800)]
am
13ef4e43: docs: update GP badges with localized badges. includes AI files for all badges in available languages
* commit '
13ef4e43ef3790cafd269b19e751f78504d7ac8c':
docs: update GP badges with localized badges. includes AI files for all badges in available languages
Scott Main [Tue, 8 Jan 2013 20:33:48 +0000 (12:33 -0800)]
Merge "docs: resolve bugs from external tracker" into jb-mr1-dev
Scott Main [Tue, 11 Dec 2012 01:35:50 +0000 (17:35 -0800)]
docs: update GP badges with localized badges.
includes AI files for all badges in available languages
Change-Id: Iff31696068fa2969f685f2bdab74eb737a22488c
Scott Main [Tue, 8 Jan 2013 02:51:49 +0000 (18:51 -0800)]
docs: resolve bugs from external tracker
Change-Id: I680970ec63701197103f6c5ab55c25c736aa0519
Jason Noguchi [Tue, 8 Jan 2013 03:15:16 +0000 (19:15 -0800)]
am
3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev
* commit '
3f72bf323f977b367ceaee5ace321098cb7b74f4':
Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
Jason Noguchi [Tue, 8 Jan 2013 03:11:32 +0000 (19:11 -0800)]
Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev
Jason Noguchi [Tue, 8 Jan 2013 02:43:18 +0000 (18:43 -0800)]
am
7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit '
7b4e597faff3c469bdd5e7837155a5fc5ea036bc':
Adding camera scene mode stress test.
Jason Noguchi [Tue, 8 Jan 2013 02:40:27 +0000 (18:40 -0800)]
Merge "Adding camera scene mode stress test." into jb-mr1-dev
Scott Main [Mon, 7 Jan 2013 23:58:19 +0000 (15:58 -0800)]
am
e30d31c4: docs: misc bugs from external tracker
* commit '
e30d31c4e8439f8fa8647744cee93f1fd8b67407':
docs: misc bugs from external tracker
Scott Main [Mon, 7 Jan 2013 23:54:30 +0000 (15:54 -0800)]
docs: misc bugs from external tracker
Change-Id: I928659b23d1ff3a5d017d4fb50acb8ac0e3b251b
Scott Main [Sat, 5 Jan 2013 02:57:18 +0000 (18:57 -0800)]
am
8f70a7c4: move the nsdchat sample to proper download directory
* commit '
8f70a7c46cc3c4732b11fd8088b47c3434cf64d9':
move the nsdchat sample to proper download directory
Scott Main [Sat, 5 Jan 2013 02:54:08 +0000 (18:54 -0800)]
move the nsdchat sample to proper download directory
Change-Id: I9679e5642ffaa1baad104c5fa1c1f90b59a5b1ff
Scott Main [Sat, 5 Jan 2013 02:51:32 +0000 (18:51 -0800)]
am
47e8d20d: move network usage sample zip
* commit '
47e8d20d7b87be59ce38828659231afd425d05f8':
move network usage sample zip
Scott Main [Sat, 5 Jan 2013 02:47:39 +0000 (18:47 -0800)]
move network usage sample zip
Change-Id: I4ed2ebe357d420fea20d69515d9e91dc73579bba
Scott Main [Sat, 5 Jan 2013 02:19:00 +0000 (18:19 -0800)]
am
4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
* commit '
4e483ed30697472aceb05bb1555f14b066ee8502':
docs: misc bug fixes. including important versioning fixes for first app class
Scott Main [Sat, 5 Jan 2013 02:16:15 +0000 (18:16 -0800)]
Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
Scott Main [Sat, 5 Jan 2013 01:41:54 +0000 (17:41 -0800)]
docs: misc bug fixes. including important versioning fixes for first app class
Change-Id: Ifda2509fc90dd795bfd6c5e9b3d7eebcbd77892a
Katie McCormick [Sat, 5 Jan 2013 00:34:19 +0000 (16:34 -0800)]
am
2b13a475: Doc update: fixed manifest typo in Network zip
* commit '
2b13a475409aa28890c93088e86c065da1b07044':
Doc update: fixed manifest typo in Network zip
Katie McCormick [Sat, 5 Jan 2013 00:17:45 +0000 (16:17 -0800)]
Doc update: fixed manifest typo in Network zip
Change-Id: Iccf6dbce9d975337ab23b26dce63d3ec31303320
Scott Main [Fri, 4 Jan 2013 19:33:59 +0000 (11:33 -0800)]
am
197d0a66: Merge "docs: update sony driver link and name bug:
6566732" into jb-mr1-dev
* commit '
197d0a6688ccf72632b461987671f1f2802935b7':
docs: update sony driver link and name bug:
6566732
Scott Main [Fri, 4 Jan 2013 19:29:11 +0000 (11:29 -0800)]
Merge "docs: update sony driver link and name bug:
6566732" into jb-mr1-dev
Scott Main [Fri, 4 Jan 2013 19:06:40 +0000 (11:06 -0800)]
docs: update sony driver link and name
bug:
6566732
Change-Id: I8cb6e3295a24a7876d9cc9493889d85688357f79
Robert Ly [Fri, 4 Jan 2013 19:03:04 +0000 (11:03 -0800)]
am
6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
* commit '
6b79e9542b2b2fae18a882696e61adb4fce144eb':
docs: update gms and gcm javadocs with new TOC
Robert Ly [Fri, 4 Jan 2013 18:58:55 +0000 (10:58 -0800)]
Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
Robert Ly [Fri, 4 Jan 2013 18:13:35 +0000 (10:13 -0800)]
docs: update gms and gcm javadocs with new TOC
Change-Id: Ic54c4e4e6e2b0008450abe9d3aa1ae53535d9160
Scott Main [Fri, 4 Jan 2013 02:36:45 +0000 (18:36 -0800)]
am
3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
* commit '
3e2479dd20ee9a1dab17e5dbec7fc835f2fa427f':
docs: fix broken links and add new sitemap text file
Scott Main [Fri, 4 Jan 2013 02:32:45 +0000 (18:32 -0800)]
Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
Scott Main [Fri, 4 Jan 2013 02:02:21 +0000 (18:02 -0800)]
docs: fix broken links and add new sitemap text file
Change-Id: If0f7967a65a6e3a444a565a2e8229a04a5265f56
Katie McCormick [Fri, 4 Jan 2013 00:11:31 +0000 (16:11 -0800)]
am
ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
* commit '
ed2a05bc5b05e8aec0777ce2eb57bb91626524d8':
Doc change: minor fixes to support lib lesson.
Katie McCormick [Fri, 4 Jan 2013 00:07:45 +0000 (16:07 -0800)]
Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
Katie McCormick [Thu, 3 Jan 2013 23:50:40 +0000 (15:50 -0800)]
Doc change: minor fixes to support lib lesson.
Bug #
7633596
Change-Id: I380300b818cb6886c3c6857b64ba54e0602f7a37
Jason Noguchi [Tue, 11 Dec 2012 02:13:09 +0000 (18:13 -0800)]
Refactoring the media recorder stress test.
Added test cases for:
- record & playback @ 1080p
- record & playback @ 720p
- record & playback @ 480p
- record & playback @ custom
Plus extending the record duration to a full minute.
Change-Id: I294714811606c1ae57907d6ef6a7052044b6247c
Scott Main [Thu, 3 Jan 2013 19:47:20 +0000 (11:47 -0800)]
am
9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev
* commit '
9fe82f1bc7c880bb1ec5ac3a9a1b5fff2c0bdda9':
docs: dashboard update for 1/3/13
Scott Main [Thu, 3 Jan 2013 19:44:43 +0000 (11:44 -0800)]
Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev
Scott Main [Thu, 3 Jan 2013 18:56:31 +0000 (10:56 -0800)]
docs: dashboard update for 1/3/13
Change-Id: I0ff0b045d1c08a071fa706d8c0ff17943f2e752f
Xavier Ducrohet [Thu, 3 Jan 2013 18:43:39 +0000 (10:43 -0800)]
am
22d7cf23: Add single crunch command to aapt. do not merge.
* commit '
22d7cf239d8a9b009ea7adf86d8826a8a8116d03':
Add single crunch command to aapt. do not merge.
Jason Noguchi [Tue, 11 Dec 2012 01:05:32 +0000 (17:05 -0800)]
Adding camera scene mode stress test.
Change-Id: I3f9afef4edc6ea1f659263bf2dbd8ca247039ce0
Xavier Ducrohet [Fri, 21 Dec 2012 17:54:02 +0000 (09:54 -0800)]
Add single crunch command to aapt. do not merge.
Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.
The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.
(cherry picked from commit
b1f6ad82dd8d1702617a757a88430604b3131fac)
Change-Id: I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
Scott Main [Sat, 22 Dec 2012 00:29:16 +0000 (16:29 -0800)]
am
0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev
* commit '
0dae634b06f5dc6039a5aaa9c0f00250e10c6547':
docs: add class on keyboards
Scott Main [Sat, 22 Dec 2012 00:25:49 +0000 (16:25 -0800)]
Merge "docs: add class on keyboards" into jb-mr1-dev
Scott Main [Sat, 22 Dec 2012 00:25:36 +0000 (16:25 -0800)]
am
dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
* commit '
dc2c1a0f80042c42768fd868791e21412c3839b9':
docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
Scott Main [Thu, 6 Dec 2012 00:13:25 +0000 (16:13 -0800)]
docs: add class on keyboards
Change-Id: I3fb179457af50eec9d111f84eb9fabf49bc7ab1b
Scott Main [Wed, 19 Dec 2012 00:07:36 +0000 (16:07 -0800)]
docs: add explanation of default permissions to Permission guide
and fix code snippet error in WebView guide.
external issue:41441
Change-Id: I5d021e4f04245385b62e992baebd702814fff930
kmccormick@google.com [Fri, 21 Dec 2012 20:46:03 +0000 (12:46 -0800)]
am
5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev
* commit '
5b03460fcb69394b984fad1a63e244f9aa798886':
cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
&& repo sync -j8 [Fri, 21 Dec 2012 20:43:13 +0000 (12:43 -0800)]
Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev
&& repo sync -j8 [Sat, 1 Dec 2012 00:28:27 +0000 (16:28 -0800)]
cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
Change-Id: I72c2621dcc674a2f486ec2a49e0eb409d8c9b5bd
Dirk Dougherty [Thu, 20 Dec 2012 20:49:22 +0000 (12:49 -0800)]
am
0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev
* commit '
0402b65327aa568c7ea706879d9ddb222436aa87':
Doc change: point developer landing page featured content to blog post.
Dirk Dougherty [Thu, 20 Dec 2012 20:46:00 +0000 (12:46 -0800)]
Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev
Dirk Dougherty [Thu, 20 Dec 2012 20:40:22 +0000 (12:40 -0800)]
Doc change: point developer landing page featured content to blog post.
Change-Id: I8201d223b4b2c28227c7aac3499a81d29c3ec9e3
Scott Main [Thu, 20 Dec 2012 20:12:03 +0000 (12:12 -0800)]
am
8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
* commit '
8afb3ba4dac2f3e42884cb40f8fa407e072382e3':
docs: SDK r21.0.1 Release Notes
OSDN Git Service
