OSDN Git Service
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
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: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
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)
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
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
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
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:19 +0000 (18:55 +0000)]
Merge \\"docs: Migrated \\"key attestation\\" page to a new location (for N OTA).\\" into nyc-dev am:
6e4d765f95
am:
1c2845238a
Change-Id: Ib4da678f3df4a6aea1f9f7e5c270f8b28dc66ab0
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:15 +0000 (18:55 +0000)]
docs: Migrated \\"key attestation\\" page to a new location (for N OTA). am:
c946f9d103
am:
1ebaca58c4
Change-Id: Ic47192af2c1501fc7dfb54cb8594ea497172ed5b
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:12 +0000 (18:55 +0000)]
Merge \\"docs: Migrated \\"key attestation\\" page to a new location (for N OTA).\\" into nyc-dev am:
6e4d765f95
am:
5fc8256256
Change-Id: I08b7644adbe3e3d01522d5d8f963101953a63836
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:09 +0000 (18:55 +0000)]
docs: Migrated \\"key attestation\\" page to a new location (for N OTA). am:
c946f9d103
am:
acb6f631d8
Change-Id: I2e07ebc5fd1d66971d7cc153da4215d04ddafa60
Jason Monk [Tue, 26 Jul 2016 18:46:18 +0000 (18:46 +0000)]
Merge \"Fix double status bar icons\" into nyc-mr1-dev
am:
9448f1b74a
Change-Id: I49f42dd69e0fffbfa10d8616199452b1d22cd492
Kevin Hufnagle [Thu, 21 Jul 2016 20:30:49 +0000 (13:30 -0700)]
docs: Migrated "Network Security Configuration" page on DAC (N OTA).
This page now resides with other pages discussing Android security
topics.
Bug:
27502850
Change-Id: I8ce3412198527a947e47e421b94c3d15cce6ec48
Jason Monk [Tue, 26 Jul 2016 18:46:13 +0000 (18:46 +0000)]
Fix double status bar icons
am:
c6fe61c59c
Change-Id: I5d881904102d23f7aa0f593fcde496a2865bef29
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:45 +0000 (18:45 +0000)]
Merge \"docs: Migrated \"key attestation\" page to a new location (for N OTA).\" into nyc-dev
am:
6e4d765f95
Change-Id: I58fdbbe4efa20d1d8f8ca8be47b715edfe07f62c
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:42 +0000 (18:45 +0000)]
docs: Migrated \"key attestation\" page to a new location (for N OTA).
am:
c946f9d103
Change-Id: I82716c1bfd4748d61ae01909bbed0156fa43faa9
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:38 +0000 (18:45 +0000)]
Merge \"docs: Migrated \"key attestation\" page to a new location (for N OTA).\" into nyc-dev
am:
6e4d765f95
Change-Id: I1107bc377d35c8bb63a2b90118c17940105cddaf
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:35 +0000 (18:45 +0000)]
docs: Migrated \"key attestation\" page to a new location (for N OTA).
am:
c946f9d103
Change-Id: I86c74144ab6530c566550b71855f02e09840d7fe
Jason Monk [Tue, 26 Jul 2016 18:39:13 +0000 (18:39 +0000)]
Merge "Fix double status bar icons" into nyc-mr1-dev
Kevin Hufnagle [Tue, 26 Jul 2016 18:34:23 +0000 (18:34 +0000)]
Merge "docs: Migrated "key attestation" page to a new location (for N OTA)." into nyc-dev
Aga Madurska [Tue, 26 Jul 2016 18:08:55 +0000 (18:08 +0000)]
Merge \"Use correct bounds for scroll bar rendering.\" into nyc-mr1-dev
am:
af9d5daae7
Change-Id: I9e5514fa1795d88fa033438797c076d5a4b4fa46
Aga Madurska [Tue, 26 Jul 2016 18:08:47 +0000 (18:08 +0000)]
Use correct bounds for scroll bar rendering.
am:
8cc883de9e
Change-Id: Ie82427a678241e7237144bbe76493c055a17bc2d
Michael Kwan [Sat, 23 Jul 2016 01:37:31 +0000 (18:37 -0700)]
Add titles to PreferenceFragments and PreferenceScreens for watches.
Preferences lack a title on watch type devices due to lack of ActionBar
support. A custom ListView was added to use a custom wrapper adapter to
add a persistent header view at the top of the ListView that developers
would not be able to remove via the ListView API.
Bug:
27962897
Change-Id: I6bccecf85592d9507e0c7a04c9a035617001e9ef
Agnieszka Madurska [Tue, 26 Jul 2016 17:47:29 +0000 (17:47 +0000)]
Merge "Use correct bounds for scroll bar rendering." into nyc-mr1-dev
fionaxu [Tue, 26 Jul 2016 17:09:29 +0000 (17:09 +0000)]
Merge \"add pii support for Rlog\" into nyc-mr1-dev
am:
a0f07728d9
Change-Id: Iec198c636f75347116b54314626b0d107df13a24
fionaxu [Tue, 26 Jul 2016 17:09:25 +0000 (17:09 +0000)]
add pii support for Rlog
am:
a7ab821aa1
Change-Id: I47153d683efd3256d6ee8d5b9417069b097f65c9
Jason Monk [Tue, 26 Jul 2016 17:04:50 +0000 (13:04 -0400)]
Fix double status bar icons
Don't allow the status bar icon slot list to be changed because
it confuses the relationship between StatusBarIconList and
StatusBarIconController. Set it in the constructor to enforce
this.
Change-Id: Ieeea0a9efad88179d1cccc0e5702899333de2e72
Fixes:
28524184
Chen Xu [Tue, 26 Jul 2016 17:00:17 +0000 (17:00 +0000)]
Merge "add pii support for Rlog" into nyc-mr1-dev
Aga Madurska [Tue, 26 Jul 2016 14:40:31 +0000 (15:40 +0100)]
Use correct bounds for scroll bar rendering.
Bug:
30001373
Change-Id: I20c77a2d97096bda451c3a871fd6be7ad699b047
xiaoli.xb.zuo [Tue, 26 Jul 2016 15:55:13 +0000 (15:55 +0000)]
Merge \\\"Fix memory leak in MediaScannerConnection\\\" am:
e40ab18590 am:
0d5bcda101
am:
fd743b4d56
Change-Id: I9a8ef3f3ae06b5054f426e7936c5aa9548a9dfcd
Marco Nelissen [Tue, 26 Jul 2016 15:48:05 +0000 (15:48 +0000)]
Merge \\"Fix memory leak in MediaScannerConnection\\" am:
e40ab18590
am:
0d5bcda101
Change-Id: I5714252c0373db0fc85bf65df7b52c983fbc6171
Jeff Sharkey [Tue, 26 Jul 2016 15:47:04 +0000 (09:47 -0600)]
Ignore stopped/deleted users when filling cache.
Leave user checks intact on all other code paths, but quietly ignore
any trouble when filling cache after a user is started.
Bug:
30366396
Change-Id: I49458adb8fd6ddc203d6159513f4ecc50738d3e8
xiaoli.xb.zuo [Tue, 26 Jul 2016 15:43:55 +0000 (15:43 +0000)]
Merge \"Fix memory leak in MediaScannerConnection\"
am:
e40ab18590
Change-Id: I894584a5d193624acc78c20a6207b54b20b61563
Marco Nelissen [Tue, 26 Jul 2016 15:37:32 +0000 (15:37 +0000)]
Merge "Fix memory leak in MediaScannerConnection"
Paul Jensen [Tue, 26 Jul 2016 14:39:45 +0000 (14:39 +0000)]
Merge \"Sanity check ICMP6 router advertisement packets\" into nyc-mr1-dev
am:
4e40413c50
Change-Id: I5365b39534fd01efe9f2d8e74efd1ccba06eba4a
Paul Jensen [Tue, 26 Jul 2016 14:39:42 +0000 (14:39 +0000)]
Sanity check ICMP6 router advertisement packets
am:
4b545b04f6
Change-Id: I129ce4cbe5c893e507050ff23fd2f5261466c970
Paul Jensen [Tue, 26 Jul 2016 14:33:30 +0000 (14:33 +0000)]
Merge \"Don\'t let sign-in to network app appear in recents when it finishes\" into nyc-mr1-dev
am:
c78bd7f01f
Change-Id: I288ab6796ab15e982423cf6e58bfdacf1ca5cf52
Paul Jensen [Tue, 26 Jul 2016 14:33:26 +0000 (14:33 +0000)]
Don\'t let sign-in to network app appear in recents when it finishes
am:
6a776c8317
Change-Id: Id0bca631f030c8c344b1bcac52f731152ab858a0
Paul Jensen [Tue, 26 Jul 2016 14:29:59 +0000 (14:29 +0000)]
Merge "Sanity check ICMP6 router advertisement packets" into nyc-mr1-dev
Paul Jensen [Tue, 26 Jul 2016 14:26:29 +0000 (14:26 +0000)]
Merge "Don't let sign-in to network app appear in recents when it finishes" into nyc-mr1-dev
Hugo Benichi [Tue, 26 Jul 2016 05:34:56 +0000 (05:34 +0000)]
Merge \"Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission\" into nyc-mr1-dev
am:
7c731f9e1f
Change-Id: I22c2a9aaedcdbf842c1afe119edaaac18c3522df
Hugo Benichi [Tue, 26 Jul 2016 04:08:14 +0000 (13:08 +0900)]
resolve merge conflicts of
514da60 to nyc-mr1-dev-plus-aosp
Change-Id: Ib1c01241fece36f660d27f3450ba8059b3b2809f
Hugo Benichi [Tue, 26 Jul 2016 02:46:30 +0000 (02:46 +0000)]
Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into nyc-mr1-dev
Christopher Tate [Mon, 25 Jul 2016 21:50:08 +0000 (14:50 -0700)]
Fix wallpaper restore from pre-N devices
The previous path "worked" but left the wallpaper bookkeeping with
incorrect SELinux labeling, which led to cascade failures later on
when apps tried to set new system wallpaper imagery or read the
current image for the picker UI.
We now (a) explicitly label wallpaper files in all change cases,
(b) let the restored imagery flow through the full crop path, as
should have been done in the first place, and as a result (c) lift
the size restrictions on the source image, because now we are doing
a device-appropriate scaling operation on the image.
The "when to crop/scale" test has been slightly relaxed such that
a restored image of exactly the right size now longer triggers a
superfluous factor-1.0 scaling operation.
Bug
30361282
Change-Id: I9a305eea2227952493f64ab78862648cafb816ff
Amith Yamasani [Mon, 25 Jul 2016 21:59:57 +0000 (14:59 -0700)]
Persist configuration for the calling or current user
Persist the font size change to the correct user.
Bug:
30273473
Change-Id: Ia29735d4112720389a30b61f961f6c1071ce4ba2
Makoto Onuki [Mon, 25 Jul 2016 22:12:23 +0000 (15:12 -0700)]
Update ShortcutManager javadoc
Bug
30359231
Change-Id: I01f1987416fa1ac3f0669afa1f15f88ff2dd1631
Chris Craik [Tue, 26 Jul 2016 00:29:48 +0000 (00:29 +0000)]
Merge \"Avoid destroying TextureView surfaces for onStop\" into nyc-mr1-dev
am:
eaa6d6b2c9
Change-Id: Ic8207def7703c1209dbb3b33301803b32cc44bb7
Chris Craik [Tue, 26 Jul 2016 00:29:44 +0000 (00:29 +0000)]
Avoid destroying TextureView surfaces for onStop
am:
391d560402
Change-Id: I6e1e5a5f024410e7e0288910386cbc439b8a9039
TreeHugger Robot [Tue, 26 Jul 2016 00:06:43 +0000 (00:06 +0000)]
Merge "Avoid destroying TextureView surfaces for onStop" into nyc-mr1-dev
Hangyu Kuang [Mon, 25 Jul 2016 23:45:38 +0000 (23:45 +0000)]
Merge \"media: Add hidden api to set video encoding profile and level.\" into nyc-mr1-dev
am:
e7e1f0b788
Change-Id: I9322ddf1e5dba78363b87976639433f008620753
Hangyu Kuang [Mon, 25 Jul 2016 23:45:35 +0000 (23:45 +0000)]
media: Add hidden api to set video encoding profile and level.
am:
f70ad43f13
Change-Id: I3bb9bf5884d791dd5d97fbda8117d1d4f3b1b40f
TreeHugger Robot [Mon, 25 Jul 2016 23:39:59 +0000 (23:39 +0000)]
Merge "media: Add hidden api to set video encoding profile and level." into nyc-mr1-dev
Michael Kwan [Mon, 25 Jul 2016 23:05:54 +0000 (23:05 +0000)]
Merge \"Add top and bottom panel overlay to lists in AlertDialog for watch.\" into nyc-mr1-dev
am:
ad74941699
Change-Id: I36e7157a24141db4cd17828206435788b8abb69a
Michael Kwan [Mon, 25 Jul 2016 23:05:43 +0000 (23:05 +0000)]
Add top and bottom panel overlay to lists in AlertDialog for watch.
am:
55e4030f77
Change-Id: I383c2ad50871265c1f521ecfd7f46d15027dc29c
Vladislav Kaznacheev [Mon, 25 Jul 2016 23:05:31 +0000 (23:05 +0000)]
Merge \"Fix AM.revokeUriPermissionFromOwner for prefix mode.\" into nyc-mr1-dev
am:
0217d4e6b8
Change-Id: I90c33ff1d5d24f2cd5e578d98193ee900eff6cc1
Vladislav Kaznacheev [Mon, 25 Jul 2016 23:05:22 +0000 (23:05 +0000)]
Fix AM.revokeUriPermissionFromOwner for prefix mode.
am:
4498aa6c58
Change-Id: I752efeb20f5fd28576babb7f90bdc79dbec02366
Philip P. Moltmann [Mon, 25 Jul 2016 23:05:14 +0000 (23:05 +0000)]
Merge \"Set title in onCreate.\" into nyc-mr1-dev
am:
fb5a07938f
Change-Id: Icfb399258314565515c151cb3d3b188b868a76b2
Philip P. Moltmann [Mon, 25 Jul 2016 23:05:10 +0000 (23:05 +0000)]
Set title in onCreate.
am:
fef31ad5ae
Change-Id: Ide036a4f9bed9953040be7aa0f0fee26f9c84c82
Android Build Merger (Role) [Mon, 25 Jul 2016 22:52:07 +0000 (22:52 +0000)]
Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev am:
65dfc2a3e5
Fix NPE in ValueAnimator am:
543a7ed7af
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:53 +0000 (22:51 +0000)]
Merge changes from topic 'am-
9fd0a895a44f4e7ebb6eebb2d79a62a9' into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev am:
4e0fc3ccd2
Enforce consistent sizes for arrays in SpannableStringInternal am:
83549088c6
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:38 +0000 (22:51 +0000)]
Merge changes Idf939fd3,I6ae3f730 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Handle USB power role \'sink\'\" into nyc-mr1-dev am:
d021ba34fb
Handle USB power role \'sink\' am:
0135516153
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:21 +0000 (22:51 +0000)]
Merge "Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am:
d579d713a5 am:
0da397ea71" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:03 +0000 (22:51 +0000)]
Merge "docs: updates to Buildilng Your First App doc am:
08d1bff71f am:
325ce1a475" into nyc-mr1-dev-plus-aosp
Justin Klaassen [Mon, 25 Jul 2016 22:50:11 +0000 (22:50 +0000)]
Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev
am:
65dfc2a3e5
Change-Id: I1acc3a4f5e540900f6e798e924ff26d5ab954d89
Justin Klaassen [Mon, 25 Jul 2016 22:50:07 +0000 (22:50 +0000)]
Fix NPE in ValueAnimator
am:
543a7ed7af
Change-Id: Ib049d75f8c8460c3e7498080bbe502e67078e6ac
Raph Levien [Mon, 25 Jul 2016 22:49:47 +0000 (22:49 +0000)]
Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev
am:
4e0fc3ccd2
Change-Id: I1d9951d56d0ba4893e4b09fb984cde3328ec390a
Raph Levien [Mon, 25 Jul 2016 22:49:14 +0000 (22:49 +0000)]
Enforce consistent sizes for arrays in SpannableStringInternal
am:
83549088c6
Change-Id: I6fd3b65dd388abcce6f8b7062f396a6fcf8fdf7a
OSDN Git Service
