OSDN Git Service
Daniel Yu [Wed, 27 Jul 2016 20:27:23 +0000 (20:27 +0000)]
docs: Migrating Scoped Dir Access preview docs into DAC am:
8a481eaf20
am:
13768a377f
Change-Id: Ib25c2b4ffbd84b74b7fc3c3395f2c2dbdc4aca76
Daniel Yu [Wed, 27 Jul 2016 20:27:20 +0000 (20:27 +0000)]
docs: Migrating Direct Boot preview docs into DAC am:
bb0f35306e
am:
3c5cc98e20
Change-Id: Ifcf59d198d97f4c47d369945d6dc29aea81f3528
Daniel Yu [Wed, 27 Jul 2016 20:20:35 +0000 (20:20 +0000)]
docs: Migrating TV Recording APIs preview docs into DAC am:
4900647321
am:
89429b1a43
Change-Id: Ia317016a7a0a160c7623ce6b534dc4d71a06958b
Dan Yu [Wed, 27 Jul 2016 20:20:32 +0000 (20:20 +0000)]
Merge \\"docs: Migrating PIP preview docs into regular DAC docs\\" into nyc-dev am:
020726fac7
am:
4be71169d5
Change-Id: Id1d5b6e4319618f9eb6d4fd2d3f673977a632e86
Daniel Yu [Wed, 27 Jul 2016 20:20:30 +0000 (20:20 +0000)]
docs: Migrating PIP preview docs into regular DAC docs am:
e0fa75cfa7
am:
2218132041
Change-Id: I5b7943aee95554eee48fd7284658e851056950b2
Daniel Yu [Wed, 27 Jul 2016 20:20:26 +0000 (20:20 +0000)]
docs: Migrating Scoped Dir Access preview docs into DAC
am:
8a481eaf20
Change-Id: I53ae716ef626c0249d46df86ecd2682d90c7e740
Hemal Patel [Wed, 27 Jul 2016 20:20:26 +0000 (20:20 +0000)]
Merge \\\"Docs: Used NotificationCompat.MediaStyle\\\" into nyc-docs am:
b2baf25d34 am:
b36153a8a1
am:
347628b0e6
Change-Id: I3bdac9f3b888c6b458a715457d4cdb5d8757a2d1
Hemal Patel [Wed, 27 Jul 2016 20:20:23 +0000 (20:20 +0000)]
Docs: Used NotificationCompat.MediaStyle am:
d3c609cbc1 am:
bae260d909
am:
a22902ceaa
Change-Id: I71f571b939d87eff3110de549916697f74a856eb
Daniel Yu [Wed, 27 Jul 2016 20:20:21 +0000 (20:20 +0000)]
docs: Migrating Direct Boot preview docs into DAC
am:
bb0f35306e
Change-Id: I5a72146578321e4644af7fc8aeab3bf47afa8147
Daniel Yu [Wed, 27 Jul 2016 20:13:09 +0000 (20:13 +0000)]
docs: Migrating TV Recording APIs preview docs into DAC
am:
4900647321
Change-Id: I6a800ef249d10cffe0a03530f5e1ee7a8d4d2e38
Daniel Yu [Wed, 27 Jul 2016 20:13:06 +0000 (20:13 +0000)]
Merge \"docs: Migrating PIP preview docs into regular DAC docs\" into nyc-dev
am:
020726fac7
Change-Id: I1c2664b7773bef948bb5ba5d522abcf94a51602a
Daniel Yu [Wed, 27 Jul 2016 20:13:03 +0000 (20:13 +0000)]
docs: Migrating PIP preview docs into regular DAC docs
am:
e0fa75cfa7
Change-Id: Ia68e7ad021d1acf7373a7bbe0856167616572ecd
Hemal Patel [Wed, 27 Jul 2016 20:12:59 +0000 (20:12 +0000)]
Merge \\"Docs: Used NotificationCompat.MediaStyle\\" into nyc-docs am:
b2baf25d34
am:
b36153a8a1
Change-Id: I8ff6dbe07ebf4c3e07309f6155c5614244e907b2
Hemal Patel [Wed, 27 Jul 2016 20:12:56 +0000 (20:12 +0000)]
Docs: Used NotificationCompat.MediaStyle am:
d3c609cbc1
am:
bae260d909
Change-Id: I4024cad11f6664bdfd348c783193c47c5eb76a7a
Daniel Yu [Fri, 22 Jul 2016 22:50:58 +0000 (15:50 -0700)]
docs: Migrating Scoped Dir Access preview docs into DAC
For Android N release, migrating and updating Scoped Directory Access
docs into regular DAC docs. Updated TOC and added redirect.
Removed preview/features doc. Updated and moved images.
Bug:
30257320
Change-Id: I3440fe1b74947cbfbd1ada6f5d6bee5e49847927
Daniel Yu [Fri, 22 Jul 2016 00:43:35 +0000 (17:43 -0700)]
docs: Migrating Direct Boot preview docs into DAC
For Android N release, migrating and updating Direct Boot
docs into regular DAC docs. Updated TOC and added redirect.
Removed preview/features doc.
Bug:
30256895
Change-Id: I5c6d457dc69c911199f86f0e0ed93ec7d6244779
Daniel Yu [Thu, 21 Jul 2016 20:45:31 +0000 (13:45 -0700)]
docs: Migrating TV Recording APIs preview docs into DAC
For Android N release, migrating and updating TV Recording
API preview docs into regular DAC TV (TIF) docs. Updating
training TOC and adding redirect. Removing preview/features doc.
Bug:
30224466
Change-Id: Ia92f27467ccaa1d36dc69c5bd3c784509f267791
Dan Yu [Wed, 27 Jul 2016 19:29:40 +0000 (19:29 +0000)]
Merge "docs: Migrating PIP preview docs into regular DAC docs" into nyc-dev
Hemal Patel [Wed, 27 Jul 2016 19:26:10 +0000 (19:26 +0000)]
Merge \"Docs: Used NotificationCompat.MediaStyle\" into nyc-docs
am:
b2baf25d34
Change-Id: Iff64c50170add9331ad840b3a2c60170947922d6
Hemal Patel [Wed, 27 Jul 2016 19:26:05 +0000 (19:26 +0000)]
Docs: Used NotificationCompat.MediaStyle
am:
d3c609cbc1
Change-Id: Ia297b36f995caa5b552722d475461ec1be321136
Hemal Patel [Wed, 27 Jul 2016 19:13:52 +0000 (19:13 +0000)]
Merge "Docs: Used NotificationCompat.MediaStyle" into nyc-docs
Daniel Yu [Tue, 19 Jul 2016 20:45:38 +0000 (13:45 -0700)]
docs: Migrating PIP preview docs into regular DAC docs
For Android N release, migrating and updating PIP preview docs
into regular DAC TV docs. Updating TOCs and redirects as well.
Bug:
26487936
Change-Id: I00a57cc0bfff6929cdba56ce00a6a5e9a292e345
Adarsh Fernando [Wed, 27 Jul 2016 16:10:49 +0000 (16:10 +0000)]
Merge \\"Docs: Clarified certain restrictions to whitelisted apps\\" into nyc-dev am:
ec694b4e27
am:
f14c1288db
Change-Id: I5d392463b458ea76107bfd45db4f7029bd0624db
Adarsh Fernando [Wed, 27 Jul 2016 16:10:46 +0000 (16:10 +0000)]
Docs: Clarified certain restrictions to whitelisted apps am:
33aae3167d
am:
57c378bb75
Change-Id: I39d32cc29877894f17e83897f2dc2c1989c51db7
Adarsh Fernando [Wed, 27 Jul 2016 16:01:55 +0000 (16:01 +0000)]
Merge \"Docs: Clarified certain restrictions to whitelisted apps\" into nyc-dev
am:
ec694b4e27
Change-Id: I31ebdc2a2a3450bd309bdaf2a882afc2846f64ed
Adarsh Fernando [Wed, 27 Jul 2016 16:01:50 +0000 (16:01 +0000)]
Docs: Clarified certain restrictions to whitelisted apps
am:
33aae3167d
Change-Id: Ib3375115339c2abf699bcc6601aeccca67219673
Adarsh Fernando [Wed, 27 Jul 2016 15:49:50 +0000 (15:49 +0000)]
Merge "Docs: Clarified certain restrictions to whitelisted apps" into nyc-dev
Android Build Merger (Role) [Wed, 27 Jul 2016 15:12:28 +0000 (15:12 +0000)]
Merge "Import translations. DO NOT MERGE am:
cdd4f84e06 -s ours am:
f3b6338d0f -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Wed, 27 Jul 2016 15:12:03 +0000 (15:12 +0000)]
Import translations. DO NOT MERGE am:
cdd4f84e06 -s ours
am:
f3b6338d0f -s ours
Change-Id: I260b44073e3e19823881ce889ef400e9cd068187
Bill Yi [Wed, 27 Jul 2016 15:11:46 +0000 (15:11 +0000)]
Import translations. DO NOT MERGE am:
cdd4f84e06 -s ours
am:
9647aed8b3 -s ours
Change-Id: I3476435c8b65cbaa2e6e3aad7dfc5614c999b81e
Bill Yi [Wed, 27 Jul 2016 15:05:29 +0000 (15:05 +0000)]
Import translations. DO NOT MERGE
am:
cdd4f84e06 -s ours
Change-Id: I4270dc2513e473cef596058338c103b6e5ecaf1b
Bill Yi [Wed, 27 Jul 2016 15:05:17 +0000 (15:05 +0000)]
Import translations. DO NOT MERGE
am:
cdd4f84e06 -s ours
Change-Id: I6e14618caf9ce565b28148fe75827416fc1894cc
Bill Yi [Wed, 27 Jul 2016 13:34:57 +0000 (06:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id7ec746499ef9a1309384e04bdb556d1616b8c11
Auto-generated-cl: translation import
Michael Wright [Wed, 27 Jul 2016 13:23:50 +0000 (13:23 +0000)]
Merge \"Actually compare supported color modes.\" into nyc-mr1-dev
am:
1df0020f2d
Change-Id: Ic30578fd66cdebc0b9c1e25747fe23f3b272fb42
Michael Wright [Wed, 27 Jul 2016 13:23:47 +0000 (13:23 +0000)]
Actually compare supported color modes.
am:
16ae042351
Change-Id: If33235e3debdca951856fcc74c5189cd936b6129
Michael Wright [Wed, 27 Jul 2016 13:14:03 +0000 (13:14 +0000)]
Merge "Actually compare supported color modes." into nyc-mr1-dev
Sergio Giro [Wed, 27 Jul 2016 12:25:08 +0000 (12:25 +0000)]
api: destroy() and isDestroyed() methods are now default in Destroyable am:
8261d1e042
am:
ea917e5206
Change-Id: I495e02eb867644ae8f621d092b5f50a397c5a7fb
Sergio Giro [Wed, 27 Jul 2016 12:20:12 +0000 (12:20 +0000)]
api: destroy() and isDestroyed() methods are now default in Destroyable
am:
8261d1e042
Change-Id: I0f377bfb1f091e642091859fbb045ccfe63ba0e5
Sergio Giro [Tue, 26 Jul 2016 19:05:22 +0000 (20:05 +0100)]
api: destroy() and isDestroyed() methods are now default in Destroyable
Change-Id: Ia5afcec8b627794bba7c69ca6245330b60aef5e9
Test: make droid docs and check-ojluni-files
Bug:
29631070
Sergio Giro [Wed, 27 Jul 2016 11:50:52 +0000 (11:50 +0000)]
Merge \\\"api: destroy() and isDestroyed() methods are now default in Destroyable\\\" am:
877d6e75e6 am:
91e11c95f2
am:
9ab5255ebb
Change-Id: I0d7ad7f86ad800555452940b1d85f0d6da16b90f
Sergio Giro [Wed, 27 Jul 2016 11:46:25 +0000 (11:46 +0000)]
Merge \\"api: destroy() and isDestroyed() methods are now default in Destroyable\\" am:
877d6e75e6
am:
91e11c95f2
Change-Id: Ib7472ea12d6c59ec6ca36d0c17d63ab5d5193b77
Sergio Giro [Wed, 27 Jul 2016 11:39:10 +0000 (11:39 +0000)]
Merge \"api: destroy() and isDestroyed() methods are now default in Destroyable\"
am:
877d6e75e6
Change-Id: I6ff9e93c43d5f9464ab29604b3aa5f93132ed74b
Sergio Giro [Wed, 27 Jul 2016 11:30:55 +0000 (11:30 +0000)]
Merge "api: destroy() and isDestroyed() methods are now default in Destroyable"
Alan Leung [Wed, 27 Jul 2016 06:10:29 +0000 (06:10 +0000)]
Merge \"Fix thread priority after boosting.\" into nyc-dev-plus-aosp
am:
ab11a7dd1c
Change-Id: If65f38f73f88f1615bdb071f0d6776907ec279c2
Alan Leung [Wed, 27 Jul 2016 06:10:23 +0000 (06:10 +0000)]
Fix thread priority after boosting.
am:
402aee85a3
Change-Id: Iad65b4d31a55b8df9b374c545657c091d05091be
Alan Leung [Wed, 27 Jul 2016 06:01:46 +0000 (06:01 +0000)]
Merge "Fix thread priority after boosting." into nyc-dev-plus-aosp
Svetoslav Ganov [Wed, 27 Jul 2016 01:37:23 +0000 (01:37 +0000)]
Merge \"Pre-grant calendar permission to default email app\" into nyc-mr1-dev
am:
993b4b2380
Change-Id: Idf414e58b8b0a69e2d8dc2b2e85c089068738119
Svetoslav Ganov [Wed, 27 Jul 2016 01:37:19 +0000 (01:37 +0000)]
Pre-grant calendar permission to default email app
am:
9df80d2628
Change-Id: I4e5cd81a6128349d7159affdea97e915fdf7087b
Mark Lu [Wed, 27 Jul 2016 01:37:14 +0000 (01:37 +0000)]
docs: updates to Buildilng Your First App doc am:
ae47d9d4fe am:
3977f8351a
am:
ca22237d04
Change-Id: Ic36d8e5b81523b48ae731a1aec28004eaf56d17f
George Mount [Wed, 27 Jul 2016 01:18:23 +0000 (01:18 +0000)]
Merge \"Check for target SDK version for out-of-order fragment creation.\" into nyc-mr1-dev
am:
4e00581e6b
Change-Id: I5ca36a50058464078885a9f4980297d11081fa74
George Mount [Wed, 27 Jul 2016 01:18:17 +0000 (01:18 +0000)]
Check for target SDK version for out-of-order fragment creation.
am:
00b7846b1e
Change-Id: If8ff087abfccdf1ff5868c2d9bbffbbaf00a23d5
Christopher Tate [Wed, 27 Jul 2016 01:18:09 +0000 (01:18 +0000)]
Merge \"Fix wallpaper restore from pre-N devices\" into nyc-mr1-dev
am:
9fd44ef954
Change-Id: I8c8bb6815299b41438f4919248a5b9b1e2b2dca2
Christopher Tate [Wed, 27 Jul 2016 01:18:05 +0000 (01:18 +0000)]
Fix wallpaper restore from pre-N devices
am:
ebadfb17e7
Change-Id: I4f88e555929bd9e48983dce64dc66f9e7fd46dc9
Amith Yamasani [Wed, 27 Jul 2016 01:17:59 +0000 (01:17 +0000)]
Merge \"Persist configuration for the calling or current user\" into nyc-mr1-dev
am:
7853ba63cd
Change-Id: I4990c800cb81410887f090f6365c91f18113bf28
Amith Yamasani [Wed, 27 Jul 2016 01:17:55 +0000 (01:17 +0000)]
Persist configuration for the calling or current user
am:
034ec49b19
Change-Id: Id5809af87a9d72cc93851ee32a437aea1849bc8a
Adrian Roos [Wed, 27 Jul 2016 01:17:46 +0000 (01:17 +0000)]
Merge \"Never show transient navigation bar when empty\" into nyc-mr1-dev
am:
6da6657858
Change-Id: Ice30e61695cca73a87e67e1a06b4547305b835fc
Svetoslav Ganov [Wed, 27 Jul 2016 01:17:41 +0000 (01:17 +0000)]
Merge "Pre-grant calendar permission to default email app" into nyc-mr1-dev
Adrian Roos [Wed, 27 Jul 2016 01:17:42 +0000 (01:17 +0000)]
Never show transient navigation bar when empty
am:
1f4259057e
Change-Id: I47739b5b1687457121564ef5f8fe9c7bb90b5b4b
Jean-Michel Trivi [Wed, 27 Jul 2016 01:17:34 +0000 (01:17 +0000)]
Merge \"Change AudioRecordingConfiguration constructor parameter order\" into nyc-mr1-dev
am:
57de824d64
Change-Id: I83bc976088eb861966dd9267fc8b07f1b8128f8b
Jean-Michel Trivi [Wed, 27 Jul 2016 01:17:29 +0000 (01:17 +0000)]
Change AudioRecordingConfiguration constructor parameter order
am:
74eb6f62f8
Change-Id: Ief48fc6b7b7f04d00ca11858b8b248cb449b2aab
Mark Lu [Wed, 27 Jul 2016 01:09:27 +0000 (01:09 +0000)]
docs: updates to Buildilng Your First App doc am:
ae47d9d4fe
am:
3977f8351a
Change-Id: I500638ffdf29106ddd65bff3425536ce1cdb0c50
Mark Lu [Wed, 27 Jul 2016 01:08:41 +0000 (01:08 +0000)]
docs: updates to Buildilng Your First App doc am:
ae47d9d4fe am:
3977f8351a
am:
9efcf16b8d
Change-Id: I5f0cf7713252c4972e6a08894ee72b25fbb1a6a9
Mark Lu [Wed, 27 Jul 2016 00:49:19 +0000 (00:49 +0000)]
docs: updates to Buildilng Your First App doc am:
ae47d9d4fe
am:
3977f8351a
Change-Id: Iea59ad167957f314adc09d90f734e1cd123577e4
Svetoslav Ganov [Tue, 26 Jul 2016 01:27:41 +0000 (18:27 -0700)]
Pre-grant calendar permission to default email app
bug:
30277932
Change-Id: I3c80e01ce720a7e7bf54cac82dc0ca0da152998d
Mark Lu [Wed, 27 Jul 2016 00:40:03 +0000 (00:40 +0000)]
docs: updates to Buildilng Your First App doc
am:
ae47d9d4fe
Change-Id: I7b3665dc0f304dcae06939a56c2423d9b269420c
Mark Lu [Fri, 15 Jul 2016 20:36:55 +0000 (13:36 -0700)]
docs: updates to Buildilng Your First App doc
This commit includes the following updates:
- replaces Basic activity with Empty activity
- uses default values wherever possible
- removes instructions for floating button
- removes SDK instructions. Users must use Android Studio
- updates the SDK version to API 15
- combines some instructions that were too text heavy
Bug:
29766869
Bug:
29768686
Bug:
19154557
Change-Id: Id819cb2dde74b68b5145dfefe7a8502892bb377a
(cherry picked from commit
08d1bff71f19e5567b8f545314fd84701e9b2cec)
Adam Powell [Tue, 26 Jul 2016 23:24:57 +0000 (23:24 +0000)]
Merge "Check for target SDK version for out-of-order fragment creation." into nyc-mr1-dev
Hemal Patel [Fri, 22 Jul 2016 22:50:48 +0000 (15:50 -0700)]
Docs: Used NotificationCompat.MediaStyle
In the Controlling Media section, updated the overview and sample code to
reference NotificationCompat.MediaStyle. Removed the note about the
pre-requisite to have Android 5.0 and higher.
Bug:
22505224
Change-Id: Id9a647ca8eec7f1b763227ee4fd1f18dee4bcb6f
Chris Tate [Tue, 26 Jul 2016 23:05:28 +0000 (23:05 +0000)]
Merge "Fix wallpaper restore from pre-N devices" into nyc-mr1-dev
Amith Yamasani [Tue, 26 Jul 2016 22:48:13 +0000 (22:48 +0000)]
Merge "Persist configuration for the calling or current user" into nyc-mr1-dev
Adrian Roos [Tue, 26 Jul 2016 22:41:54 +0000 (22:41 +0000)]
Merge "Never show transient navigation bar when empty" into nyc-mr1-dev
Jean-Michel Trivi [Tue, 26 Jul 2016 22:24:43 +0000 (22:24 +0000)]
Merge "Change AudioRecordingConfiguration constructor parameter order" into nyc-mr1-dev
Garfield, Tan [Tue, 26 Jul 2016 22:22:46 +0000 (22:22 +0000)]
Merge \"DO NOT MERGE: Change the order of 2 statements to remove race.\" into nyc-mr1-dev
am:
45ae57eab4
Change-Id: Ia7cd363c31ff456071872dd30d2b9ffb1ebc7941
Garfield, Tan [Tue, 26 Jul 2016 22:22:42 +0000 (22:22 +0000)]
DO NOT MERGE: Change the order of 2 statements to remove race.
am:
ebb8450cd0
Change-Id: Ica31fe1487551db935714f3d89543aff043d40b6
TreeHugger Robot [Tue, 26 Jul 2016 22:01:43 +0000 (22:01 +0000)]
Merge "DO NOT MERGE: Change the order of 2 statements to remove race." into nyc-mr1-dev
Jeff Sharkey [Tue, 26 Jul 2016 22:01:30 +0000 (22:01 +0000)]
Merge \"Polish up PRE_BOOT notification.\" into nyc-mr1-dev
am:
445c01b591
Change-Id: Id326e6325e5b060af1e9417e3a6a786b5f677f6a
Jeff Sharkey [Tue, 26 Jul 2016 22:00:16 +0000 (22:00 +0000)]
Polish up PRE_BOOT notification.
am:
288414e226
Change-Id: Ibb123690c44c29ee251b8499e3b0cef5a37f0e95
George Mount [Fri, 22 Jul 2016 22:25:27 +0000 (15:25 -0700)]
Check for target SDK version for out-of-order fragment creation.
Bug
30230667
Ensure that pre-N applications initialize in the proper order,
but allow N and above applications to be created prior to
asking for a Transition.
Change-Id: I859f22a7c5518e4b496cbd7ee58ef1d3206a5c86
(cherry picked from commit
78d38fc8390b9d648f88687efb333e054146865d)
Jeff Sharkey [Tue, 26 Jul 2016 21:52:04 +0000 (21:52 +0000)]
Merge "Polish up PRE_BOOT notification." into nyc-mr1-dev
Michael Kwan [Tue, 26 Jul 2016 21:11:51 +0000 (21:11 +0000)]
Merge \"Add titles to PreferenceFragments and PreferenceScreens for watches.\" into nyc-mr1-dev
am:
9f3930d3f7
Change-Id: If4a1d8df880391dc26d608b2486433142b46d317
Michael Kwan [Tue, 26 Jul 2016 21:11:47 +0000 (21:11 +0000)]
Add titles to PreferenceFragments and PreferenceScreens for watches.
am:
744be16ffa
Change-Id: I54847a5ef3ddb4e09cc835433d80e121cf32b725
FEI WU [Tue, 26 Jul 2016 21:11:42 +0000 (21:11 +0000)]
Merge \"Fix Switch in SwitchPreference on watch\" into nyc-mr1-dev
am:
90cd4449bb
Change-Id: I8a36f3177a90c4ca2722da3ac4fa627561482567
FEI WU [Tue, 26 Jul 2016 21:11:39 +0000 (21:11 +0000)]
Fix Switch in SwitchPreference on watch
am:
ba3a1359ba
Change-Id: I4d7d4ecf7dbab7c24abddfca7ac4d33b66591e04
Jean-Michel Trivi [Tue, 26 Jul 2016 18:19:18 +0000 (11:19 -0700)]
Change AudioRecordingConfiguration constructor parameter order
Switch the device and client AudioFormat parameters in the
AudioRecordingConfiguration constructor, so it's the same
order as the rest of the code involved in sending a callback
when the recording configuration changes.
Bug
30282058
Change-Id: Iea417f02dcb644e3d4dacbc0e44ea4b2eac28840
Michael Kwan [Tue, 26 Jul 2016 20:58:46 +0000 (20:58 +0000)]
Merge "Add titles to PreferenceFragments and PreferenceScreens for watches." into nyc-mr1-dev
Fei Wu [Tue, 26 Jul 2016 20:54:28 +0000 (20:54 +0000)]
Merge "Fix Switch in SwitchPreference on watch" into nyc-mr1-dev
Makoto Onuki [Tue, 26 Jul 2016 20:50:04 +0000 (20:50 +0000)]
Merge \"Update ShortcutManager javadoc\" into nyc-mr1-dev
am:
3858c4704c
Change-Id: Ic48a2f015514ef3782f650afdad5d66f7ec9389f
Makoto Onuki [Tue, 26 Jul 2016 20:50:00 +0000 (20:50 +0000)]
Update ShortcutManager javadoc
am:
fe9c9669a4
Change-Id: I4bfaca9ce475e91ec0dae45739b1623ceac8a43c
Makoto Onuki [Tue, 26 Jul 2016 20:40:03 +0000 (20:40 +0000)]
Merge "Update ShortcutManager javadoc" into nyc-mr1-dev
Jeff Sharkey [Tue, 26 Jul 2016 19:50:26 +0000 (19:50 +0000)]
Merge \"Ignore stopped/deleted users when filling cache.\" into nyc-mr1-dev
am:
0711adc84d
Change-Id: I52ffba44227224a0ca96ed4981fe94f299f77e9d
Jeff Sharkey [Tue, 26 Jul 2016 19:50:23 +0000 (19:50 +0000)]
Ignore stopped/deleted users when filling cache.
am:
38e0d0f512
Change-Id: Ie750e0f87205b4e8738fb2c61f0e9bd996e87b2b
Jeff Sharkey [Tue, 26 Jul 2016 19:36:37 +0000 (19:36 +0000)]
Merge "Ignore stopped/deleted users when filling cache." into nyc-mr1-dev
Adarsh Fernando [Tue, 26 Jul 2016 19:27:37 +0000 (12:27 -0700)]
Docs: Clarified certain restrictions to whitelisted apps
Bug:
30133512
Change-Id: I4494f85090b384831bc2534cbc813f28a62a29cf
Android Build Merger (Role) [Tue, 26 Jul 2016 19:09:38 +0000 (19:09 +0000)]
Merge "docs: Migrated \\"Network Security Configuration\\" page on DAC (N OTA). am:
78747a1164 am:
6d34698551" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:06 +0000 (19:09 +0000)]
docs: Migrated \\"Network Security Configuration\\" page on DAC (N OTA). am:
78747a1164
am:
1d7a40b34d
Change-Id: I6ce90de1a7048724be4c3fc6d4b780eded0d0219
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:03 +0000 (19:09 +0000)]
docs: Migrated \\"Network Security Configuration\\" page on DAC (N OTA). am:
78747a1164
am:
6d34698551
Change-Id: I7907170898ac394ba79d0bd3a908ecd0b823dd5e
Kevin Hufnagle [Tue, 26 Jul 2016 19:04:18 +0000 (19:04 +0000)]
docs: Migrated \"Network Security Configuration\" page on DAC (N OTA).
am:
78747a1164
Change-Id: I095a1e37838e325f7b10146cde3efb271a315ed2
Kevin Hufnagle [Tue, 26 Jul 2016 19:03:57 +0000 (19:03 +0000)]
docs: Migrated \"Network Security Configuration\" page on DAC (N OTA).
am:
78747a1164
Change-Id: If1ba3b821a6ccb368c6c61212d44ccfd04d8e7ef
Android Build Merger (Role) [Tue, 26 Jul 2016 18:56:19 +0000 (18:56 +0000)]
Merge "Merge \\"docs: Migrated \\"key attestation\\" page to a new location (for N OTA).\\" into nyc-dev am:
6e4d765f95 am:
1c2845238a" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 26 Jul 2016 18:56:01 +0000 (18:56 +0000)]
Merge "docs: Migrated \\"key attestation\\" page to a new location (for N OTA). am:
c946f9d103 am:
1ebaca58c4" into nyc-mr1-dev-plus-aosp
OSDN Git Service
