OSDN Git Service
smain@google.com [Wed, 27 Apr 2016 21:23:59 +0000 (21:23 +0000)]
Merge "Android Studio 2.1 release notes and downloads." into mnc-mr-docs am:
c939dd0 am:
19f9481
am:
88b2780
* commit '
88b27807cc248607f713e97b1791186fc7e37313':
Android Studio 2.1 release notes and downloads.
Change-Id: I55b8646648edbd6657b5bb781c6a239a828fe782
Dirk Dougherty [Wed, 27 Apr 2016 21:23:49 +0000 (21:23 +0000)]
Merge "Remove static _book.yaml in favor of generated version (samples_navtree_data.cs)." into mnc-mr-docs am:
2974e94 am:
1c1a85bc
am:
61a6d2f
* commit '
61a6d2f359e3ae81e7f962ba9fc02e0a92ceb300':
Remove static _book.yaml in favor of generated version (samples_navtree_data.cs).
Change-Id: I9086d484fc307a7c1e39a06c317383d7b2e9c7be
Kevin Hufnagle [Wed, 27 Apr 2016 21:23:39 +0000 (21:23 +0000)]
Merge "docs: Added entry in USB vendor ID table for HP." into mnc-docs am:
b8767b7 am:
599796e am:
f2f64b7
am:
c78400e
* commit '
c78400e09598850ff9404933f2d3cfc887a92339':
docs: Added entry in USB vendor ID table for HP.
Change-Id: I6d69fbd8324c77dc64bf87e0878c249a9cd099e0
smain@google.com [Wed, 27 Apr 2016 21:23:28 +0000 (21:23 +0000)]
Merge "Update the N Preview docs now that Studio 2.1 is stable. bug:
28342771" into mnc-mr-docs am:
f8e0d7f am:
b6491aa
am:
0a33248
* commit '
0a33248b1fe6a109bf33dbdf65497b00f12cba35':
Update the N Preview docs now that Studio 2.1 is stable. bug:
28342771
Change-Id: I91e30aadca32f5cef8f00e8cd52f6e8aa90b2dd9
Cheryl Potter [Wed, 27 Apr 2016 21:23:16 +0000 (21:23 +0000)]
docs: Update SDK Manager for 2.0 changes b/
26385384 am:
5f153b5 am:
559648a am:
14f034a
am:
9bfc51e
* commit '
9bfc51e3420b7c7addd842df41ad95cedc914a2c':
docs: Update SDK Manager for 2.0 changes b/
26385384
Change-Id: Ide12c014c12c970d6e6fde48e28254b94ea125c3
Cheryl Potter [Wed, 27 Apr 2016 21:23:02 +0000 (21:23 +0000)]
Merge "docs: Update SDK Manager for 2.0 changes b/
26385384" into mnc-mr-docs am:
0f6ab24 am:
4363c43
am:
d8e0ae4
* commit '
d8e0ae4768ec082ed979bb53fa461c0f3a4eb61f':
docs: Update SDK Manager for 2.0 changes b/
26385384
Change-Id: I60fe3068cf2216a9fc592ef3477c68bb947d9b94
TreeHugger Robot [Wed, 27 Apr 2016 21:22:39 +0000 (21:22 +0000)]
Merge "doc: Removed duplicate card from distribute/users page" into mnc-docs am:
b515691 am:
4a5d857 am:
f1a7aa6
am:
0a504d0
* commit '
0a504d03c10f76b7d2828a8fc2fd76a9fa57b309':
doc: Removed duplicate card from distribute/users page
Change-Id: I0739f75675050de5b9bcb65ad31ffd63c66029ad
Adarsh Fernando [Wed, 27 Apr 2016 21:21:51 +0000 (21:21 +0000)]
Docs: Added that Method References work with earlier API levels am:
11e3f91 am:
89b9ee0 am:
a6fbfaf
am:
8f00192
* commit '
8f001929cdf8c4aedc544da3ec99c7c1555351de':
Docs: Added that Method References work with earlier API levels
Change-Id: I913b328242d944be6b4718cc3c32d095dc4b386d
David Friedman [Wed, 27 Apr 2016 21:21:31 +0000 (21:21 +0000)]
Merge "Docs: Minor fix and restructuring to Vulkan validation-layer doc to prevent devs from corrupting their NDK install." into mnc-mr-docs am:
19d1e73e41 am:
68af8d0
am:
1d52e49
* commit '
1d52e49be27be077fafb16fcf700da80d7abc87b':
Docs: Minor fix and restructuring to Vulkan validation-layer doc to prevent devs from corrupting their NDK install.
Change-Id: I6c0cb2412f8a84d90718bbcc99773328a2ca7389
Svetoslav Ganov [Wed, 27 Apr 2016 21:19:05 +0000 (21:19 +0000)]
Merge "Add a missing null object check" into nyc-dev
Svetoslav Ganov [Wed, 27 Apr 2016 20:50:49 +0000 (13:50 -0700)]
Add a missing null object check
We now have a null object instead of null values and
there was a place where we returned null instead of
the correct null object.
bug:
28423485
Change-Id: I2626768acdf8d19fc94aa5e978eb057818450fa5
TreeHugger Robot [Wed, 27 Apr 2016 21:15:58 +0000 (21:15 +0000)]
Merge "Update background data restrictions intent javadoc." into nyc-dev
Dirk Dougherty [Wed, 27 Apr 2016 21:07:15 +0000 (21:07 +0000)]
Merge "resolve merge conflicts of
0d00d28 to nyc-dev" into nyc-dev
Chris Craik [Wed, 27 Apr 2016 20:52:49 +0000 (20:52 +0000)]
Merge "Fix oval positioning when drawn with patheffect" into nyc-dev
Yin-Chia Yeh [Wed, 27 Apr 2016 20:40:25 +0000 (20:40 +0000)]
Merge "Camera: codegen doc update (dynamic black level)" into nyc-dev
Jeff Sharkey [Wed, 27 Apr 2016 20:34:17 +0000 (20:34 +0000)]
Merge "Only log when system UID finds missing data paths." into nyc-dev
Ben Lin [Wed, 27 Apr 2016 20:33:51 +0000 (20:33 +0000)]
Merge "Safe check so we don't move cursor beyond possible pos scope." into nyc-dev
Dimitry Ivanov [Wed, 27 Apr 2016 20:32:24 +0000 (20:32 +0000)]
Merge changes I12c9448e,I928175a3 into nyc-dev
* changes:
Create linker namespace for the system server classloader
Extract pathclassloader initialization to a separate class
Jorim Jaggi [Wed, 27 Apr 2016 20:25:24 +0000 (20:25 +0000)]
Merge "Use FLAG_RECEIVER_FOREGROUND for lock intent" into nyc-dev
Jorim Jaggi [Wed, 27 Apr 2016 20:15:41 +0000 (13:15 -0700)]
Use FLAG_RECEIVER_FOREGROUND for lock intent
To make we get priority for the intent.
Bug:
27391589
Change-Id: I112588116d51012dbe4d66c90b839bb88bc3f21b
Dianne Hackborn [Wed, 27 Apr 2016 20:20:41 +0000 (20:20 +0000)]
Merge "Fix issue #
28403313: Improve package manager query commands" into nyc-dev
Mady Mellor [Wed, 27 Apr 2016 20:14:54 +0000 (20:14 +0000)]
Merge "Fix NPE when updating gear vertical location" into nyc-dev
Bill Yi [Wed, 27 Apr 2016 20:00:38 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Wed, 27 Apr 2016 20:00:01 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Wed, 27 Apr 2016 19:58:26 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Wed, 27 Apr 2016 19:57:19 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Jeff Hao [Wed, 27 Apr 2016 19:54:02 +0000 (19:54 +0000)]
Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 19:45:26 +0000 (19:45 +0000)]
Merge "Added logging for Data Saver toggle switch." into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 19:43:37 +0000 (19:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Raph Levien [Wed, 27 Apr 2016 19:42:19 +0000 (19:42 +0000)]
Merge "Give guidance on alternatives to deprecated locale field" into nyc-dev
Peng Xu [Wed, 27 Apr 2016 19:37:57 +0000 (19:37 +0000)]
Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev
Raph Levien [Wed, 27 Apr 2016 19:31:10 +0000 (19:31 +0000)]
Merge "Fix TextUtils#getReverse deprecated doc" into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 19:12:50 +0000 (19:12 +0000)]
Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 18:53:33 +0000 (18:53 +0000)]
Merge "Syncronize pdfium initialization between users." into nyc-dev
Mady Mellor [Wed, 27 Apr 2016 15:45:53 +0000 (08:45 -0700)]
Fix NPE when updating gear vertical location
Since we do this onLayout it's unnecessary to update the location here
plus it causes an NPE as the parent may not be laid out yet when
accessing collapsed height.
Bug:
28390732
Change-Id: I3e61eb7ce854002def3342856557d456249e5e26
Dimitry Ivanov [Wed, 20 Apr 2016 23:02:00 +0000 (16:02 -0700)]
Create linker namespace for the system server classloader
Bug: http://b/
27702070
Change-Id: I12c9448e877202937cf558de75042bcb46f6a933
(cherry picked from commit
eb5866d4b05b6c000385be4a536544e27ca13335)
Dimitry Ivanov [Wed, 20 Apr 2016 21:09:32 +0000 (14:09 -0700)]
Extract pathclassloader initialization to a separate class
To be able to reuse this code when creating a classloader for
the system_server.
Bug: http://b/
27245894
Bug: http://b/
27702070
Change-Id: I928175a39a1beb0446d863a5b8f5edf94686e768
(cherry picked from commit
5d7d777fa6f47ade2097e77d3d9ddb52c26d77d6)
Jeff Sharkey [Wed, 27 Apr 2016 18:38:02 +0000 (12:38 -0600)]
Only log when system UID finds missing data paths.
We're really only interested in tracking down when the system UID
tries touching missing data paths, since it's the only one with enough
permissions to mkdirs() directly without going through installd.
Without the guard added in this CL, we'd end up logging for direct
boot aware apps that tried obtaining CE paths while locked, which is
perfectly valid.
Bug:
28272737
Change-Id: Id24f3160f61d8ad8047d5c551bc6a91c868bd301
TreeHugger Robot [Wed, 27 Apr 2016 18:28:38 +0000 (18:28 +0000)]
Merge "Dismiss docked stack on user switch" into nyc-dev
Rob Carr [Wed, 27 Apr 2016 18:13:25 +0000 (18:13 +0000)]
Merge "Revert "Prevent recents from closing while moving PiP to fullscreen."" into nyc-dev
Jeff Hao [Wed, 16 Mar 2016 22:56:07 +0000 (15:56 -0700)]
Support to pass <uses-library> option through to dex2oat.
This change takes an app's shared libraries specified by <uses-library>
and passes it through to dex2oat to be used during compilation.
Part of a multi-project change.
Bug:
26880306
(cherry-picked from
7b331b6a8ae8d9f10482b292439457de98abd32a)
Change-Id: I523b1b74775e7ed27072498509e743f1f10b1164
Raph Levien [Wed, 27 Apr 2016 18:02:12 +0000 (11:02 -0700)]
Give guidance on alternatives to deprecated locale field
The deprecation message for the "locale" field should clearly state
what to do instead when only the primary locale is needed.
Bug:
27532422
Change-Id: I3e83cc1e9054d4e199d7e34b1a42b7bcd6c77f62
Bo Liu [Wed, 27 Apr 2016 17:58:32 +0000 (17:58 +0000)]
Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev
Selim Gurun [Wed, 27 Apr 2016 17:48:30 +0000 (17:48 +0000)]
Merge "API Review: Add @IntDef and other annotations to Menu Item flags." into nyc-dev
Dirk Dougherty [Wed, 27 Apr 2016 06:54:24 +0000 (23:54 -0700)]
resolve merge conflicts of
0d00d28 to nyc-dev
Change-Id: Ib922635fe200a4216ce2970660daf3105d521cc9
Adam Powell [Wed, 27 Apr 2016 17:42:19 +0000 (10:42 -0700)]
Fix a bug where restartLoader would result in a stuck loader
Framework edition
In some cases restartLoader calls that happen in quick succession
could cause the new loader to become stuck and never run. Treat loader
restarts for loaders that have not yet started the same as starting a
brand new loader.
Bug
27437287
https://code.google.com/p/android/issues/detail?id=56464
Change-Id: Ia4e276fc8e63d43b9c52c6155cea827b194d8b19
Clara Bayarri [Wed, 27 Apr 2016 10:53:22 +0000 (11:53 +0100)]
Fix TextUtils#getReverse deprecated doc
Note there is no alternative method to use.
Bug:
28296055
Change-Id: I1e44c1dad6009434a92c6a53862e6f061114bc56
Philip P. Moltmann [Wed, 27 Apr 2016 16:46:48 +0000 (09:46 -0700)]
Syncronize pdfium initialization between users.
Only initalize pdfium once per process and only destroy it once all
users are gone.
Bug:
28387883,
28370309,
28388184
Change-Id: I41e8f6da247a7cfab5fb9d159c047293719192c3
TreeHugger Robot [Wed, 27 Apr 2016 16:56:32 +0000 (16:56 +0000)]
Merge "Read -Xjittransitionweight from system properties." into nyc-dev
Phil Weaver [Wed, 27 Apr 2016 16:49:25 +0000 (16:49 +0000)]
Merge "Fix crash with a11y set text with text filters." into nyc-dev
Wale Ogunwale [Wed, 27 Apr 2016 16:23:55 +0000 (09:23 -0700)]
Dismiss docked stack on user switch
Having the docked stack across user switches currently leads
to issues like wrong configuration state for apps. Dismissing
docked stack for now until we find a better way to handle this.
Bug:
28195260
bug:
28221061
Change-Id: I568a2c69783b1f0d7016fe1a21df959f7c2c9145
Hangyu Kuang [Wed, 27 Apr 2016 16:38:19 +0000 (16:38 +0000)]
Merge changes from topic 'atv-hdr' into nyc-dev
* changes:
Unhide getHdrCapabilities and HdrCapabilities.
Plumb HDR capabilities to Display
Revert "Revert "Hook up HDR capabilities from native SurfaceControl""
Clara Bayarri [Wed, 27 Apr 2016 15:32:57 +0000 (15:32 +0000)]
Merge "Cleanup LocaleList docs given API review" into nyc-dev
John Reck [Wed, 27 Apr 2016 14:36:51 +0000 (14:36 +0000)]
Merge "API tweaks to PixelCopy and make it public" into nyc-dev
Calin Juravle [Wed, 27 Apr 2016 13:12:00 +0000 (14:12 +0100)]
Read -Xjittransitionweight from system properties.
Bug:
27865109
Change-Id: I4a752a68693ac7d764d006f1282398c2e95ef1d0
Clara Bayarri [Tue, 26 Apr 2016 11:18:36 +0000 (12:18 +0100)]
Cleanup LocaleList docs given API review
-- Remove default constructor from public API since getEmptyLocaleList exists
-- Merge the Locale and Locale[] constructors by providing a single Locale… varargs constructor
-- forLanguageTags, get, toLanguageTags, size, need docs
-- get(int location) should be get(int index)
Plus general docs improvements
Bug:
28296200
Change-Id: I8b4e67184f8c723daebcd251f04947d48bbb5478
Bill Yi [Wed, 27 Apr 2016 13:26:50 +0000 (06:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3a9d207063511cfd862a522bc245fbf70abfbf3b
Auto-generated-cl: translation import
Bill Yi [Wed, 27 Apr 2016 13:10:42 +0000 (06:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb4e5316af0f8a302487f3b737efef8b99f0fe9f
Auto-generated-cl: translation import
Julia Reynolds [Wed, 27 Apr 2016 12:59:03 +0000 (12:59 +0000)]
Merge "More bugreport logging for scheduleconditionprovider." into nyc-dev
Bill Yi [Wed, 27 Apr 2016 12:43:40 +0000 (05:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ice98eb3ed66513d4e324e5f1939006048caec376
Auto-generated-cl: translation import
Bill Yi [Wed, 27 Apr 2016 12:23:30 +0000 (05:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8193ab50ed5c7603bceda66cbb10c4aa7f93240f
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 27 Apr 2016 11:02:49 +0000 (11:02 +0000)]
Merge "Fix infinite loop during package-usage.list file upgrade" into nyc-dev
Erik Kline [Wed, 27 Apr 2016 09:40:06 +0000 (09:40 +0000)]
Merge "IpManager: add a provisioning timeout option" into nyc-dev
David Brazdil [Wed, 27 Apr 2016 09:35:56 +0000 (10:35 +0100)]
Fix infinite loop during package-usage.list file upgrade
When upgrading from version 0 to version 1 of the file
'/data/system/package-usage.list', the PackageManagerService can get
stuck in an infinite loop if one of the listed packages does not
exist, e.g. because it had been uninstalled. Fix the issue by
refactoring the loop.
Bug:
28409278
Change-Id: Ia312bd0d04f696240445b710dd6a68b93c5d5946
Seigo Nonaka [Wed, 27 Apr 2016 07:32:44 +0000 (16:32 +0900)]
Fix unexpected null check condition flipping.
With I5a40675dd226564c0ee190d0d6f7eb2a7e4673b0, isNull() is used for
null check but accidentally the condition is flipped.
Bug:
28406262
Change-Id: I776a6c259765210a7b334a81876233b594fd25ed
Erik Kline [Tue, 26 Apr 2016 02:48:09 +0000 (11:48 +0900)]
IpManager: add a provisioning timeout option
Relatedly: remove the provisioning timeout from DhcpClient.
Bug:
17733693
Bug:
24837343
Change-Id: I6d5b835b4ca70ba6fd06df359fc2128a0df46252
Svet Ganov [Wed, 27 Apr 2016 06:05:31 +0000 (23:05 -0700)]
Add a missing null check
We no longer have a null settings value - instead it is a
null object. This change adds a missing null check that is
not changed to check against the null object.
bug:
28406262
Change-Id: I5a40675dd226564c0ee190d0d6f7eb2a7e4673b0
Andrew Solovay [Wed, 27 Apr 2016 05:44:24 +0000 (05:44 +0000)]
doc: Removed duplicate card from distribute/users page am:
5ecc2aaee8 am:
2a7de38
am:
80b5d84
* commit '
80b5d84dcd816d7a132ee20dbc98677ff818c35f':
doc: Removed duplicate card from distribute/users page
Change-Id: I1800f2b42f5af02006d07b7b64fa1197a289da96
Scott Rowe [Wed, 27 Apr 2016 05:44:02 +0000 (05:44 +0000)]
Merge "docs: 3 additional review criteria for Android TV" into mnc-mr-docs am:
88e0bbce56 am:
1eb657a
am:
9e1a923
* commit '
9e1a9233215b21785b07a753c13ec8eed851d0e8':
docs: 3 additional review criteria for Android TV
Change-Id: I8d17d44886ea71fc11d6f8c3c03c3dc938c50b92
David Friedman [Wed, 27 Apr 2016 05:43:19 +0000 (05:43 +0000)]
Docs: Adds missing Indonesian and Vietnamese to left-hand TOC for Preview docs. am:
0e7bc1b215 am:
f829492
am:
0811472
* commit '
0811472a36c7b18635654e97866c406aab587e89':
Docs: Adds missing Indonesian and Vietnamese to left-hand TOC for Preview docs.
Change-Id: I50f0e413de828bd4aa61dadd462e525e00dcf659
David Friedman [Wed, 27 Apr 2016 05:42:07 +0000 (05:42 +0000)]
Merge "Docs: Localized DAC pages for N Preview." into mnc-mr-docs am:
e20502c240 am:
1c2ce95
am:
25a92f0
* commit '
25a92f0762ea5fc1e60f00b6f7634ffccc8265cd':
Docs: Localized DAC pages for N Preview.
Change-Id: I6bc25875398fbad13821095a5e0115969620fcdb
Cheryl Potter [Wed, 27 Apr 2016 05:41:44 +0000 (05:41 +0000)]
Merge "docs: Small edits to Vector Asset Studio Support Library support b/
28199128" into mnc-mr-docs am:
0a67c6a am:
b8f834d
am:
1f48ddb
* commit '
1f48ddb1902764bdcbd4eb885a25a1c8c5897a34':
docs: Small edits to Vector Asset Studio Support Library support b/
28199128
Change-Id: I4fdd22938e8e4443b3d69fc4173aac3824d83ce4
Daniel Yu [Wed, 27 Apr 2016 05:41:21 +0000 (05:41 +0000)]
Merge "docs: Fixing various minor issues" into mnc-mr-docs am:
9780f94 am:
cf35d40
am:
d563c25
* commit '
d563c253911b5ad86804b474acbc931d27572d2a':
docs: Fixing various minor issues
Change-Id: Ied80c3fc5cbe1af6fce8a006af698170601bf292
Kevin Hufnagle [Wed, 27 Apr 2016 05:40:59 +0000 (05:40 +0000)]
Merge "docs: [Revert] Improved description of "package" attribute (manifest)." into mnc-mr-docs am:
fa8847d am:
ee3411d
am:
0e5d260
* commit '
0e5d260ae793a42efc974c0674a530f808d7f05a':
docs: [Revert] Improved description of "package" attribute (manifest).
Change-Id: I336b8fa0787934813004b8c3b322a408635c6c87
Cheryl Potter [Wed, 27 Apr 2016 05:40:37 +0000 (05:40 +0000)]
docs: Remove banned deep link term from release notes b/
28153615 am:
0489fe9 am:
6e09530
am:
d88a3ca
* commit '
d88a3caddb34aed7bef5a7d01f62164eacbcbbb0':
docs: Remove banned deep link term from release notes b/
28153615
Change-Id: Ibdf8a433c31d8487d1319ff61912baacc0500e3e
Kevin Hufnagle [Wed, 27 Apr 2016 05:40:13 +0000 (05:40 +0000)]
Merge "docs: Improved description of "package" attribute (manifest)." into mnc-mr-docs am:
190bf3b943 am:
19db30b
am:
7e8840d
* commit '
7e8840dec7879e2973ebf1e09c74a482c1ee8651':
docs: Improved description of "package" attribute (manifest).
Change-Id: I8ea2623afea04cc3f5c5b9550fc66cb42d79a5d2
Kevin Hufnagle [Wed, 27 Apr 2016 05:39:08 +0000 (05:39 +0000)]
Merge "docs: Clarified purpose of application "name" attr within manifest." into mnc-mr-docs am:
c3500321cd am:
c9c3ad8
am:
3c8a59f
* commit '
3c8a59fc25e7d1bd777f15ef9712696b341e2a49':
docs: Clarified purpose of application "name" attr within manifest.
Change-Id: Ic8bb4cc1edbbef00d06d030e1cdae215ceb9d2e5
Adarsh Fernando [Wed, 27 Apr 2016 05:38:04 +0000 (05:38 +0000)]
Merge "Docs: Background optimizations \'foreground\' -> \'running app\' fix." into mnc-mr-docs am:
df0509bce1 am:
86efe43
am:
016500b
* commit '
016500bd5850869db649abe616ab327118b843d9':
Docs: Background optimizations 'foreground' -> 'running app' fix.
Change-Id: I90a096de57b9591304623a9713d2ef103c814290
Kevin Hufnagle [Wed, 27 Apr 2016 05:24:42 +0000 (05:24 +0000)]
Merge "resolve merge conflicts of
70adfe3 to nyc-dev" into nyc-dev
Bill Yi [Wed, 27 Apr 2016 05:23:19 +0000 (22:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I462f55a9c48e4154ce97bbe76b2b8ef6add73086
Auto-generated-cl: translation import
Jeff Tinker [Wed, 27 Apr 2016 05:21:47 +0000 (05:21 +0000)]
Merge "Remove MediaDrm stack from mediaserver" into nyc-dev
Kevin Hufnagle [Wed, 27 Apr 2016 05:14:38 +0000 (22:14 -0700)]
resolve merge conflicts of
70adfe3 to nyc-dev
Change-Id: I0dbd35b74a8cc1427258b4066d759a6861faba8f
Cheryl Potter [Wed, 27 Apr 2016 04:31:04 +0000 (04:31 +0000)]
Merge "docs: Attach debugger to process 2.0 update and corrections" into mnc-mr-docs am:
97f8b66 am:
b7b1e22
am:
93c7630
* commit '
93c7630146507e1c828361d7a90fd1b8e22487da':
docs: Attach debugger to process 2.0 update and corrections
Change-Id: I1f4ee7ea866b76c3702c06b73ca96cb724e17b44
Amanda Kassay [Wed, 27 Apr 2016 04:30:36 +0000 (04:30 +0000)]
Merge "Copied over redirects from mnc-mr-docs/vendor/google/docs/app-engine-server/v4/redirects.yaml b/
27314537" into mnc-mr-docs am:
0050cd7 am:
bb0a302
am:
8306431
* commit '
83064319b2d925c052513f1b19b22fd65f9d47f7':
Copied over redirects from mnc-mr-docs/vendor/google/docs/app-engine-server/v4/redirects.yaml b/
27314537
Change-Id: I1be69f55016dc8902726a3b5d6e9fae6c598ba0c
Ryan Seys [Wed, 27 Apr 2016 04:30:00 +0000 (04:30 +0000)]
Merge "Fix a couple typos and clarify UI requirements for banner images" into mnc-mr-docs am:
7c9712b am:
97c3608
am:
cef06ba
* commit '
cef06ba4ed9dde6c51f96f3d0c246c530c175ca3':
Fix a couple typos and clarify UI requirements for banner images
Change-Id: Id67c91f881ab919d1428849102e4946ff0042530
Cheryl Potter [Wed, 27 Apr 2016 04:28:09 +0000 (04:28 +0000)]
Merge "docs: Remove unsupported emulator features and refer users to Android Emulator b/
28070270" into mnc-mr-docs am:
5f57a68 am:
fa6e4eb
am:
bbb15ba
* commit '
bbb15bab85c1583912bb7b9d630512a3d98a05d7':
docs: Remove unsupported emulator features and refer users to Android Emulator b/
28070270
Change-Id: I3029969ef1a147699644f2b87604eb9cf249e47e
Andrew Solovay [Wed, 27 Apr 2016 04:27:35 +0000 (04:27 +0000)]
docs: Adding "OEM Unlock" issue to DP2 Release Notes am:
80d04a7 am:
ee1ecbb
am:
8278d99
* commit '
8278d999c2d1edb6be9e0c5217fd030a4f8cbbce':
docs: Adding "OEM Unlock" issue to DP2 Release Notes
Change-Id: I3625aeaf5f2f2850b9420fcc1e0e6c7692ef7ea1
Adarsh Fernando [Wed, 27 Apr 2016 04:27:04 +0000 (04:27 +0000)]
Merge "Docs: Fixed refrences of 65K -> 64K" into mnc-mr-docs am:
1938352 am:
99f3f9c
am:
a7905c2
* commit '
a7905c2cc4c2da88c5f3c3f52e02347bf60e7a25':
Docs: Fixed refrences of 65K -> 64K
Change-Id: I549efee1802f1e4106323f55249280e75f1c62a6
Cheryl Potter [Wed, 27 Apr 2016 04:26:30 +0000 (04:26 +0000)]
Merge "docs: Vector Asset Studio support for Support Library in AS 2.0 b/
26949405" into mnc-mr-docs am:
90518c7 am:
d726826
am:
33351ef
* commit '
33351ef5e564d0751698d8c2ebab1ad9a5bf052e':
docs: Vector Asset Studio support for Support Library in AS 2.0 b/
26949405
Change-Id: I5e4de173c25eeb3701f2dcb7f37d849bc9815443
David Friedman [Wed, 27 Apr 2016 04:24:55 +0000 (04:24 +0000)]
Merge "Docs: Adds Vulkan-related KIs to the N-DP2 "Support and Release Notes" page." into mnc-mr-docs am:
863db15 am:
dd3abf8
am:
1561e33
* commit '
1561e331167223b3c631508fb3d14fb590e55554':
Docs: Adds Vulkan-related KIs to the N-DP2 "Support and Release Notes" page.
Change-Id: I5e68b81a32beef3c5fbddd89b24c825d11a2ab2d
Cheryl Potter [Wed, 27 Apr 2016 04:24:02 +0000 (04:24 +0000)]
Merge "docs: Update Lint instructions for Android Studio b/
26627201 b/
26987391" into mnc-mr-docs am:
517ea98 am:
22be914
am:
56e4b32
* commit '
56e4b32a121259a20dfbaf7077e69bcd8f52dcb0':
docs: Update Lint instructions for Android Studio b/
26627201 b/
26987391
Change-Id: I1f1639789a89b8f268e5c62d3436d735a0830346
Cheryl Potter [Wed, 27 Apr 2016 04:23:28 +0000 (04:23 +0000)]
Merge "docs: Fix multi-touch doc b/
28163832" into mnc-mr-docs am:
e42d550 am:
1ab0f3f
am:
f2b790c
* commit '
f2b790ce99455538727d957ad9100326e39aa3d9':
docs: Fix multi-touch doc b/
28163832
Change-Id: Icc4e6264bd69f3aebc6747888e85c56d7f4b9a6a
Andrew Solovay [Wed, 27 Apr 2016 04:22:51 +0000 (04:22 +0000)]
Merge "docs: Android for Work updates to DP2 Release Notes" into mnc-mr-docs am:
86bcabf am:
59b5161
am:
087a37f
* commit '
087a37f433c606bea80338d2bcd57f48073bb71b':
docs: Android for Work updates to DP2 Release Notes
Change-Id: Iaa87037b9ece35a5901246b0cc3abea4bebfef57
Adarsh Fernando [Wed, 27 Apr 2016 04:21:30 +0000 (04:21 +0000)]
Merge "Docs: Updated Jack/J8 doc for DP2" into mnc-mr-docs am:
ed6921b am:
be83917
am:
7ac2c21
* commit '
7ac2c2164d2498b8b4d451cda7ce0cedb4a6e1fd':
Docs: Updated Jack/J8 doc for DP2
Change-Id: Icaaedaf9fb3db8b422a8db187d7ad64acf0bf518
Winson Chung [Wed, 27 Apr 2016 04:02:09 +0000 (04:02 +0000)]
Merge "Mark header bar buttons as clickable only when they are made visible." into nyc-dev
Joe Fernandez [Wed, 27 Apr 2016 03:46:54 +0000 (03:46 +0000)]
docs: Fixes for DP2 docs am:
1271b6e am:
4e3fbe8
am:
46e8c2a
* commit '
46e8c2af79fe3699bd22398f6f4611907d8cebf8':
docs: Fixes for DP2 docs
Change-Id: I33a14dc06cce2a66de7774adee42dfafe00ad51f
David Friedman [Wed, 27 Apr 2016 03:46:12 +0000 (03:46 +0000)]
Docs: Updates NDK TOC to include new Vulkan pages. am:
1ab34c0 am:
2e1974c
am:
75b3275
* commit '
75b32758d1bc8a62966edb9596e8e23bc0291394':
Docs: Updates NDK TOC to include new Vulkan pages.
Change-Id: I253aab51457b12328a3010055da8a32f4db57efe
Joe Fernandez [Wed, 27 Apr 2016 03:45:19 +0000 (03:45 +0000)]
docs: N Developer Preview 2 downloads am:
922b5e4 am:
6ef51c6
am:
b14ac73
* commit '
b14ac736d0e4822d383feeed405cc6f2735bfeba':
docs: N Developer Preview 2 downloads
Change-Id: I0ecae4c9c02e956a711cc5c6d8359e712c6f8787
Andrew Solovay [Wed, 27 Apr 2016 03:43:36 +0000 (03:43 +0000)]
Merge "docs: Continuing work on the N DP2 release notes." into mnc-mr-docs am:
cd40b61 am:
c308aa4
am:
b9d7f7d
* commit '
b9d7f7d52c2e091138c8d4edf6ec40a64519e069':
docs: Continuing work on the N DP2 release notes.
Change-Id: I1853d8776e478ad7c9abf4064de20ad824aa3a2c
Andrew Solovay [Wed, 27 Apr 2016 03:42:45 +0000 (03:42 +0000)]
docs: Continuing work on the N DP2 API Overview. am:
f5266e5 am:
ef86375
am:
3d3af77
* commit '
3d3af778f84769c82e4c603fd30fccb60296b9e8':
docs: Continuing work on the N DP2 API Overview.
Change-Id: Ifea3883e6e2337f1272dd55671899766f072514c