OSDN Git Service
The Android Open Source Project [Sat, 23 Nov 2013 03:31:23 +0000 (19:31 -0800)]
The Android Open Source Project [Sat, 23 Nov 2013 01:40:32 +0000 (17:40 -0800)]
Chris Craik [Fri, 22 Nov 2013 23:07:52 +0000 (23:07 +0000)]
Merge "Clean up quick rejection, especially surrounding points + lines."
Chris Craik [Wed, 20 Nov 2013 02:00:46 +0000 (18:00 -0800)]
Clean up quick rejection, especially surrounding points + lines.
bug:
4351353
quickReject and quickRejectNoScissor have been renamed and refactored:
- to make the scissor side effect clear and explicit
- dangerous methods no longer public
- to make the simple quick reject check logic const
- simple quick reject is now conservative
This CL also fixes several issues with line and point quickRejection -
sub-pixel and hairline lines are much less likely to be incorrectly
rejected, especially at small canvas scale.
Additionally, alpha modulation for AA points < 1px in size is now
correct, dumplicating SW behavior (similar to lines and stroked
shapes work).
Change-Id: Ibb0710c721b9fb415d05acf54dd3d2b4d602156a
The Android Open Source Project [Fri, 22 Nov 2013 19:18:57 +0000 (11:18 -0800)]
Merge commit '
b873a17ce7be0a9771c24999adca6964431728f6' into HEAD
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
Dirk Dougherty [Fri, 22 Nov 2013 19:03:29 +0000 (11:03 -0800)]
am
a6703462: am
a0501105: am
9eaa9443: Disable samples browsing temporarily.
* commit '
a6703462926408fa83f41a2cb319e4f51fa7d4ca':
Disable samples browsing temporarily.
Dirk Dougherty [Fri, 22 Nov 2013 18:59:52 +0000 (10:59 -0800)]
am
a0501105: am
9eaa9443: Disable samples browsing temporarily.
* commit '
a0501105723ac742114ee07bd610ddf5e2713c82':
Disable samples browsing temporarily.
Dirk Dougherty [Fri, 22 Nov 2013 18:55:28 +0000 (18:55 +0000)]
am
9eaa9443: Disable samples browsing temporarily.
* commit '
9eaa94439121f6cb03bff8ecf0acbcbc74442f2d':
Disable samples browsing temporarily.
Dirk Dougherty [Fri, 22 Nov 2013 18:46:22 +0000 (10:46 -0800)]
Disable samples browsing temporarily.
Change-Id: I65fe533f1b43903d6605d17691ec142d062b6b5e
Dirk Dougherty [Fri, 22 Nov 2013 18:45:47 +0000 (10:45 -0800)]
am
3ee2c60e: am
8b5da356: am
1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs
* commit '
3ee2c60e453e19b02b0ab52793045d2dd9a20912':
Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
Dirk Dougherty [Fri, 22 Nov 2013 18:42:11 +0000 (10:42 -0800)]
am
8b5da356: am
1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs
* commit '
8b5da35670960586d5b41ee101026b89522ceb74':
Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
Dirk Dougherty [Fri, 22 Nov 2013 18:38:20 +0000 (18:38 +0000)]
am
1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs
* commit '
1448d3cd81a685c68b0102e8303c0db4e6e5668f':
Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
Dirk Dougherty [Fri, 22 Nov 2013 18:36:03 +0000 (18:36 +0000)]
Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs
Nick Kralevich [Fri, 22 Nov 2013 18:22:45 +0000 (10:22 -0800)]
fixup HTML
Change-Id: I99c31aae8e6e4e674a7c762a942a9cc82cf6e821
Nick Kralevich [Fri, 22 Nov 2013 18:15:40 +0000 (10:15 -0800)]
Add samsung to security contacts.
Change-Id: I7c4225083d4969109e37eac42f8d470daead3fb7
Jeff Brown [Fri, 22 Nov 2013 07:00:23 +0000 (23:00 -0800)]
am
2458681b: am
263c4310: am
ce468a35: Stop wifi display discovery when no longer needed.
* commit '
2458681b3ea4571d2f1254ef597475fe6a582907':
Stop wifi display discovery when no longer needed.
Robert Greenwalt [Fri, 22 Nov 2013 07:00:16 +0000 (23:00 -0800)]
am
15b3efc9: am
ecfae4f8: am
a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue"
* commit '
15b3efc9620662d83b66d75c663bb893ca0bc6e9':
fix ethernet and wifi can't be tuned seperately issue
Craig Mautner [Fri, 22 Nov 2013 07:00:12 +0000 (23:00 -0800)]
am
67ed39bb: am
90192a61: am
0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()"
* commit '
67ed39bbdb17a516508ceb31a414eeecb5623381':
Make SurfaceView layers captured by screenshotApplications()
Jeff Brown [Fri, 22 Nov 2013 03:47:30 +0000 (19:47 -0800)]
am
263c4310: am
ce468a35: Stop wifi display discovery when no longer needed.
* commit '
263c431017c51fc51c85454a0f9cc7979001a3c1':
Stop wifi display discovery when no longer needed.
Jeff Brown [Fri, 22 Nov 2013 03:43:00 +0000 (19:43 -0800)]
am
ce468a35: Stop wifi display discovery when no longer needed.
* commit '
ce468a35b388ca46578934706b38dbae94941643':
Stop wifi display discovery when no longer needed.
Jeff Brown [Fri, 22 Nov 2013 00:42:03 +0000 (16:42 -0800)]
Stop wifi display discovery when no longer needed.
Keep track of how many clients are requesting scans and scan
continuously until all of them are gone then explicitly terminate the
scan instead of letting it time out as before.
Suspend wifi display scans while connecting or connected to a remote
display. This is handled by both the display manager and media router
since neither has complete information about what is happening.
Much of this code will no longer be needed once wifi display support
is integrated directly into the media router service.
Ensure that we don't attempt to scan or connect to wifi displays
while the wifi display feature is off.
Infer when a connection attempt fails and unselect the wifi display
route automatically so it doesn't appear to be connecting forever.
Fix issues around correctly canceling and retrying connection attempts.
Often we would cancel but not retry.
Improved connection reliability somewhat. It seems that discovery must
already be in progress in order for a connection attempt to succeed.
Ensure QuickSettings uses exactly the same logic as the MediaRouteButton
to determine when the remote display tile should be made visible.
Bug:
11717053
Change-Id: I18afc977b0e8c26204b8c96adaa79f05225f7b6e
Robert Greenwalt [Fri, 22 Nov 2013 02:44:12 +0000 (18:44 -0800)]
am
ecfae4f8: am
a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue"
* commit '
ecfae4f899873f224e1aeed076dc8a41f8884487':
fix ethernet and wifi can't be tuned seperately issue
Craig Mautner [Fri, 22 Nov 2013 02:43:43 +0000 (18:43 -0800)]
am
90192a61: am
0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()"
* commit '
90192a6165f37207fa8ceb15c07aa9582327c294':
Make SurfaceView layers captured by screenshotApplications()
Dirk Dougherty [Fri, 22 Nov 2013 02:11:58 +0000 (18:11 -0800)]
Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
Change-Id: If59372a92f0572d54af0f2ed7f9f9e401fbce067
Robert Greenwalt [Fri, 22 Nov 2013 02:02:00 +0000 (18:02 -0800)]
am
a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue"
* commit '
a4c8fabfbb0bf5bf9da5267c13230c5169b5943d':
fix ethernet and wifi can't be tuned seperately issue
Robert Greenwalt [Fri, 22 Nov 2013 01:57:04 +0000 (01:57 +0000)]
Merge "fix ethernet and wifi can't be tuned seperately issue"
Lorenzo Colitti [Fri, 22 Nov 2013 01:27:14 +0000 (01:27 +0000)]
Merge "Pass DNS server info notifications to observers."
Nick Kralevich [Thu, 21 Nov 2013 23:45:28 +0000 (23:45 +0000)]
Merge "Add OEM specific addresses"
Newton Allen [Thu, 21 Nov 2013 23:36:45 +0000 (15:36 -0800)]
am
1f57ad47: am
27bd4440: am
28029658: Fix javadoc typo in SparseArray.
* commit '
1f57ad47b5a0000b47c24f29332b1128d7c6f74f':
Fix javadoc typo in SparseArray.
Newton Allen [Thu, 21 Nov 2013 23:32:42 +0000 (15:32 -0800)]
am
27bd4440: am
28029658: Fix javadoc typo in SparseArray.
* commit '
27bd44401e48b5b676a1ce5e4940aff3200fb536':
Fix javadoc typo in SparseArray.
Newton Allen [Thu, 21 Nov 2013 23:28:28 +0000 (23:28 +0000)]
am
28029658: Fix javadoc typo in SparseArray.
* commit '
2802965888566244d8642ba32775b7b2a3cec655':
Fix javadoc typo in SparseArray.
Newton Allen [Thu, 21 Nov 2013 21:27:10 +0000 (13:27 -0800)]
Fix javadoc typo in SparseArray.
Change-Id: Ie69b2cf96dae95b6ebe7b7797d3755749aec9f35
(cherry picked from commit
ebb47950f21d3c41955a591000dfb1f195e746fe)
Dianne Hackborn [Thu, 21 Nov 2013 22:16:52 +0000 (14:16 -0800)]
am
3d004830: am
2c082ae3: am
90e9b1d3: Fix issue #
11790471: Crash removed home buttons and notification bar/shade
* commit '
3d0048304590a61cf32902440a3fcc27d0281f89':
Fix issue #
11790471: Crash removed home buttons and notification bar/shade
Dianne Hackborn [Thu, 21 Nov 2013 22:14:12 +0000 (14:14 -0800)]
am
2c082ae3: am
90e9b1d3: Fix issue #
11790471: Crash removed home buttons and notification bar/shade
* commit '
2c082ae3d209aa590c1839d75436f7aa77b37125':
Fix issue #
11790471: Crash removed home buttons and notification bar/shade
Dianne Hackborn [Thu, 21 Nov 2013 22:08:00 +0000 (14:08 -0800)]
am
90e9b1d3: Fix issue #
11790471: Crash removed home buttons and notification bar/shade
* commit '
90e9b1d3dc15e97bb7ecb88289c3707fe03fb1a6':
Fix issue #
11790471: Crash removed home buttons and notification bar/shade
Newton Allen [Thu, 21 Nov 2013 21:27:10 +0000 (13:27 -0800)]
Fix javadoc typo in SparseArray.
Change-Id: Ie69b2cf96dae95b6ebe7b7797d3755749aec9f35
Dianne Hackborn [Thu, 21 Nov 2013 20:50:01 +0000 (12:50 -0800)]
Fix issue #
11790471: Crash removed home buttons and notification bar/shade
Whoops persistent processes are, well, persistent. Don't remove
services from them. We'll be keeping that process record around.
Change-Id: I29e9fb6f704efdf0caad5e0307a7adbb416eed3b
Svetoslav Ganov [Thu, 21 Nov 2013 20:22:59 +0000 (12:22 -0800)]
am
4f23b610: am
b95d6f54: am
c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev
* commit '
4f23b6104e11be81f3e2ca1a1031de6ca112f50a':
Revert "PreferenceFragment showing the breadcrumb when not needed."
Svetoslav Ganov [Thu, 21 Nov 2013 20:22:55 +0000 (12:22 -0800)]
am
dbab7e17: am
4ed5f502: am
4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev
* commit '
dbab7e1794f91e3dc4b0617df6fb59183c7349e5':
Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
Svetoslav Ganov [Thu, 21 Nov 2013 20:19:05 +0000 (12:19 -0800)]
am
b95d6f54: am
c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev
* commit '
b95d6f549b0f8260873fd9c2662fa3bf7ee2b1e8':
Revert "PreferenceFragment showing the breadcrumb when not needed."
Svetoslav Ganov [Thu, 21 Nov 2013 20:19:02 +0000 (12:19 -0800)]
am
4ed5f502: am
4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev
* commit '
4ed5f502a748fc351025346b04d50a5fae2a3bef':
Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
Svetoslav Ganov [Thu, 21 Nov 2013 20:15:22 +0000 (12:15 -0800)]
am
c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev
* commit '
c6db9c3b371ed8a90fa064f0487440d8a1d8bd46':
Revert "PreferenceFragment showing the breadcrumb when not needed."
Svetoslav Ganov [Thu, 21 Nov 2013 20:15:19 +0000 (12:15 -0800)]
am
4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev
* commit '
4d159661f453fa5d04698033f4bf6256f0d3c16a':
Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
Svetoslav Ganov [Thu, 21 Nov 2013 20:12:12 +0000 (20:12 +0000)]
Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev
Svetoslav Ganov [Thu, 21 Nov 2013 20:12:02 +0000 (20:12 +0000)]
Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev
Dirk Dougherty [Thu, 21 Nov 2013 19:57:32 +0000 (11:57 -0800)]
am
3eddb621: am
a40420c9: am
43eea0a6: Merge "Doc change: Change description for BRAND. Bug:
11431921" into klp-docs
* commit '
3eddb6213dc017c78e6d641f7f4a4685db09851e':
Doc change: Change description for BRAND. Bug:
11431921
Dirk Dougherty [Thu, 21 Nov 2013 19:53:27 +0000 (11:53 -0800)]
am
a40420c9: am
43eea0a6: Merge "Doc change: Change description for BRAND. Bug:
11431921" into klp-docs
* commit '
a40420c9c1c8216fd0251dc550bb22e9cc1dd177':
Doc change: Change description for BRAND. Bug:
11431921
Dirk Dougherty [Thu, 21 Nov 2013 19:49:46 +0000 (19:49 +0000)]
am
43eea0a6: Merge "Doc change: Change description for BRAND. Bug:
11431921" into klp-docs
* commit '
43eea0a640db07c4da05146f7e68eae567592bdb':
Doc change: Change description for BRAND. Bug:
11431921
Dirk Dougherty [Thu, 21 Nov 2013 19:45:45 +0000 (19:45 +0000)]
Merge "Doc change: Change description for BRAND. Bug:
11431921" into klp-docs
Katie McCormick [Thu, 21 Nov 2013 19:39:50 +0000 (11:39 -0800)]
am
f49578ad: am
de70d796: am
4181da02: Merge "Doc update: Minor additions to storage doc" into klp-docs
* commit '
f49578adff1f79520ce9fafea98d4abe371b1ec0':
Doc update: Minor additions to storage doc
Svetoslav Ganov [Thu, 21 Nov 2013 19:36:22 +0000 (19:36 +0000)]
Revert "PreferenceFragment showing the breadcrumb when not needed."
This reverts commit
7db97b0a29c613afb78c2734bf2504324a71963d.
Change-Id: Iefe9807fd75baf04e61ec59b508e438320c80fe3
Katie McCormick [Thu, 21 Nov 2013 19:35:56 +0000 (11:35 -0800)]
am
de70d796: am
4181da02: Merge "Doc update: Minor additions to storage doc" into klp-docs
* commit '
de70d796a564ca3cc833def566f83880be5b573f':
Doc update: Minor additions to storage doc
Svetoslav Ganov [Thu, 21 Nov 2013 19:33:53 +0000 (19:33 +0000)]
Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
This reverts commit
2b8795a9db2d494c38d34fd113a9153880a555c0.
Change-Id: If8dcc7190cbe66af09945d8b23a3e1d8fd791b1d
Katie McCormick [Thu, 21 Nov 2013 19:29:32 +0000 (19:29 +0000)]
am
4181da02: Merge "Doc update: Minor additions to storage doc" into klp-docs
* commit '
4181da02966255cc50e6a0af3e9fba38812abc8a':
Doc update: Minor additions to storage doc
Katie McCormick [Thu, 21 Nov 2013 19:26:36 +0000 (19:26 +0000)]
Merge "Doc update: Minor additions to storage doc" into klp-docs
Katie McCormick [Wed, 13 Nov 2013 02:42:08 +0000 (18:42 -0800)]
Doc update: Minor additions to storage doc
Change-Id: I59aa961a94393221be3c5f847a9fc82aa43e3a6f
Geoff Mendal [Thu, 21 Nov 2013 18:59:47 +0000 (10:59 -0800)]
am
3c1004f1: (-s ours) am
735f915d: (-s ours) am
35f097a7: (-s ours) Import translations. DO NOT MERGE
* commit '
3c1004f1a69b1723396f77615333cc880d2d5343':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 18:56:15 +0000 (10:56 -0800)]
am
735f915d: (-s ours) am
35f097a7: (-s ours) Import translations. DO NOT MERGE
* commit '
735f915de647b4df9370f6e16a5b9a6bfc6c358f':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 18:53:28 +0000 (10:53 -0800)]
am
35f097a7: (-s ours) Import translations. DO NOT MERGE
* commit '
35f097a7bf4f30d0006221e9ae376ab85ab6937a':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 18:42:03 +0000 (10:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9cb0b85bb832e20fadbeb464485d0f0dc1e8b762
Auto-generated-cl: translation import
Dirk Dougherty [Thu, 21 Nov 2013 18:38:10 +0000 (10:38 -0800)]
am
577a2531: am
e8d820b5: am
58c168a1: Merge "Doc change: update download progress image." into klp-docs
* commit '
577a2531b5f0ad9641586d568406dc7407e17bc2':
Doc change: update download progress image.
Dirk Dougherty [Thu, 21 Nov 2013 18:33:37 +0000 (10:33 -0800)]
am
e8d820b5: am
58c168a1: Merge "Doc change: update download progress image." into klp-docs
* commit '
e8d820b5a35d42eb77222af0887d72ad23500740':
Doc change: update download progress image.
Dirk Dougherty [Thu, 21 Nov 2013 18:29:38 +0000 (18:29 +0000)]
am
58c168a1: Merge "Doc change: update download progress image." into klp-docs
* commit '
58c168a1b934c61472176d6de3cfa8996953126c':
Doc change: update download progress image.
Dirk Dougherty [Thu, 21 Nov 2013 18:26:05 +0000 (18:26 +0000)]
Merge "Doc change: update download progress image." into klp-docs
Dirk Dougherty [Thu, 21 Nov 2013 17:49:40 +0000 (09:49 -0800)]
Doc change: update download progress image.
Change-Id: Ib0a4a00cc69a5fa6c552f70aaf40a682e539c41e
Dirk Dougherty [Wed, 30 Oct 2013 01:33:29 +0000 (18:33 -0700)]
Doc change: Change description for BRAND.
Bug:
11431921
Change-Id: Id08bb58a52699942e0cf626aeb577ac05c84c575
Craig Mautner [Thu, 21 Nov 2013 16:50:05 +0000 (08:50 -0800)]
am
0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()"
* commit '
0495f4eded46efd7035ed672dc933ec6430b93fd':
Make SurfaceView layers captured by screenshotApplications()
Craig Mautner [Thu, 21 Nov 2013 16:45:28 +0000 (16:45 +0000)]
Merge "Make SurfaceView layers captured by screenshotApplications()"
Derek Sollenberger [Thu, 21 Nov 2013 15:04:02 +0000 (15:04 +0000)]
Merge "framework changes needed to support Skia at r12108."
Sangkyu Lee [Thu, 21 Nov 2013 06:20:33 +0000 (15:20 +0900)]
Make SurfaceView layers captured by screenshotApplications()
Since SurfaceView layers are located below application layers,
SurfaceView is not captured by screenshotApplications()
when the application is running in fullscreen.
Moreover, ws.isFullscreen(dw, dh) returns mostly true
on the devices which do not use the navigation bar.
Change-Id: Ia1036c79054950384a97504714929fd85c8147de
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
Jeff Brown [Thu, 21 Nov 2013 00:56:29 +0000 (16:56 -0800)]
am
f508c2b0: am
d2a0192b: am
b40ce4b8: Make action bar media router icons blue again.
* commit '
f508c2b0fbe8ad1c0555db5d47c0812d80b9e367':
Make action bar media router icons blue again.
Jeff Brown [Thu, 21 Nov 2013 00:51:07 +0000 (16:51 -0800)]
am
d2a0192b: am
b40ce4b8: Make action bar media router icons blue again.
* commit '
d2a0192bf237994f0132625fc00d21896912151e':
Make action bar media router icons blue again.
Jeff Brown [Thu, 21 Nov 2013 00:48:52 +0000 (16:48 -0800)]
am
b40ce4b8: Make action bar media router icons blue again.
* commit '
b40ce4b8e85b44c8dc190bdfac0106402102280b':
Make action bar media router icons blue again.
Scott Main [Thu, 21 Nov 2013 00:39:09 +0000 (16:39 -0800)]
am
67360115: am
9f229afd: am
93fd2d0e: add Google+ links to support page bug:
7143885
* commit '
67360115ecbbf0fce8ebfbe47c4f97c132272c38':
add Google+ links to support page bug:
7143885
Scott Main [Thu, 21 Nov 2013 00:36:12 +0000 (16:36 -0800)]
am
9f229afd: am
93fd2d0e: add Google+ links to support page bug:
7143885
* commit '
9f229afd2382b15347d1398a6b81c130e1e0021e':
add Google+ links to support page bug:
7143885
Scott Main [Thu, 21 Nov 2013 00:29:41 +0000 (00:29 +0000)]
am
93fd2d0e: add Google+ links to support page bug:
7143885
* commit '
93fd2d0ea771e08f5ae124120875fb779010b87a':
add Google+ links to support page bug:
7143885
Scott Main [Wed, 20 Nov 2013 23:33:33 +0000 (15:33 -0800)]
add Google+ links to support page
bug:
7143885
Change-Id: I200d7b84694169e5adf2d13a0b6f2c56ab76a727
Jeff Brown [Wed, 20 Nov 2013 23:27:14 +0000 (15:27 -0800)]
Make action bar media router icons blue again.
This partially reverts commit
e7ae644522f692c204d0233f91e77c7841bdfe53.
Bug:
11790271
Change-Id: Ib83dbede4472ba08bcf79bf9009d690278841723
Tim Murray [Wed, 20 Nov 2013 22:46:46 +0000 (22:46 +0000)]
Merge "Convert Java/JNI to 64-bit, part 2."
Glenn Kasten [Wed, 20 Nov 2013 22:39:47 +0000 (22:39 +0000)]
Merge "KeypressInvalid_48k.ogg was 44.1 kHz previously"
Chong Zhang [Wed, 20 Nov 2013 22:34:00 +0000 (14:34 -0800)]
am
db44cb92: am
6b0653ff: am
bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev
* commit '
db44cb92ecae78f0fa5a8fe60eb1d35393c67507':
Only scan for wifi display when there is no active connections
Chong Zhang [Wed, 20 Nov 2013 22:30:11 +0000 (14:30 -0800)]
am
6b0653ff: am
bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev
* commit '
6b0653ffadea757c87724594b70922cd11dcd835':
Only scan for wifi display when there is no active connections
Chong Zhang [Wed, 20 Nov 2013 22:27:44 +0000 (14:27 -0800)]
am
bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev
* commit '
bfdecccc48ef2fd9bfb19d77be2492f22971fed9':
Only scan for wifi display when there is no active connections
Chong Zhang [Wed, 20 Nov 2013 22:24:20 +0000 (22:24 +0000)]
Merge "Only scan for wifi display when there is no active connections" into klp-dev
John Spurlock [Wed, 20 Nov 2013 21:47:51 +0000 (21:47 +0000)]
Merge "Remove unused imports from frameworks/base."
Baligh Uddin [Wed, 20 Nov 2013 21:20:44 +0000 (13:20 -0800)]
am
b6c3d5b4: (-s ours) am
ed95cabf: (-s ours) am
bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b6c3d5b4ac9300fdb2902509ff485feadcae9553':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 21:16:20 +0000 (13:16 -0800)]
am
ed95cabf: (-s ours) am
bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ed95cabf4cd13febec213ad342d947c7c847180c':
Import translations. DO NOT MERGE
Nick Kralevich [Wed, 20 Nov 2013 20:59:08 +0000 (12:59 -0800)]
Add OEM specific addresses
Add OEM specific security addresses to the Android Security FAQ.
It's a partial list for now, but we'll build this up over time.
Delete the security@android.com hyperlink. I think people are
accidentally clicking on the link, causing empty e-mails to
get sent to us.
Change-Id: If516a15169bd79f45d5aa3bef2b0bd2c6af8f0fa
Baligh Uddin [Wed, 20 Nov 2013 21:11:58 +0000 (13:11 -0800)]
am
bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
bc77af5b4c2161d7bc1e2de7dc472f343d7f9581':
Import translations. DO NOT MERGE
Scott Main [Wed, 20 Nov 2013 21:09:54 +0000 (13:09 -0800)]
am
214c2503: am
383ce297: am
3aec4328: add Analytics event tracking for Studio download
* commit '
214c250354166ee783aef2ed69aa678880995f46':
add Analytics event tracking for Studio download
Baligh Uddin [Wed, 20 Nov 2013 21:08:38 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 20 Nov 2013 21:08:31 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 20 Nov 2013 21:08:21 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Scott Main [Wed, 20 Nov 2013 21:05:30 +0000 (13:05 -0800)]
am
383ce297: am
3aec4328: add Analytics event tracking for Studio download
* commit '
383ce297d7086e8166aab9607b5101da73486ed1':
add Analytics event tracking for Studio download
Scott Main [Wed, 20 Nov 2013 21:02:38 +0000 (21:02 +0000)]
am
3aec4328: add Analytics event tracking for Studio download
* commit '
3aec4328da1e02993517ddc9c119aca24c7ce680':
add Analytics event tracking for Studio download
Scott Main [Wed, 20 Nov 2013 20:51:28 +0000 (12:51 -0800)]
add Analytics event tracking for Studio download
Change-Id: I85c2db10d431f32316eabdae5d37e03afd7e83bf
Scott Main [Wed, 20 Nov 2013 20:46:06 +0000 (12:46 -0800)]
am
05194598: am
4dcf23b6: am
64fedb77: add new video button to some pages
* commit '
051945986f325a0dfce13a98ade7d1c60cc7d185':
add new video button to some pages
Scott Main [Wed, 20 Nov 2013 20:41:41 +0000 (12:41 -0800)]
am
4dcf23b6: am
64fedb77: add new video button to some pages
* commit '
4dcf23b6f50aa5c43e6c7e86cb4b14caa669e954':
add new video button to some pages
Scott Main [Wed, 20 Nov 2013 20:39:15 +0000 (20:39 +0000)]
am
64fedb77: add new video button to some pages
* commit '
64fedb7725f082ce6bde94c3599d2e7c203ae077':
add new video button to some pages
Scott Main [Tue, 12 Nov 2013 17:12:38 +0000 (09:12 -0800)]
add new video button to some pages
Change-Id: Ie1f1875d041ff662aee709cd5f7d3110e438d0d5
OSDN Git Service
