Bert McMeen
|
a55993fcf2
|
Merge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev am: 90150e0c68
am: 0ecb50002d
Change-Id: I2c65a759285d2632da38ca7ac823b3c65c624596
|
2016-09-28 22:23:20 +00:00 |
|
Bert McMeen
|
31f99e2e8d
|
Docs: Preview 3 - Update to bridging of notifications am: 1c3bccceb2
am: fb089099ee
Change-Id: I82b17ee9538af761a2d50e934667a7e0095fa8cd
|
2016-09-28 22:22:27 +00:00 |
|
Kenny Root
|
973285bc49
|
Merge "Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master am: f8243e1e99" into nyc-dev-plus-aosp
am: 640780236c
Change-Id: If1f641775e416404761a5b4cd57fae59a18ae303
|
2016-09-28 22:19:29 +00:00 |
|
Kenny Root
|
7c2e1f2652
|
Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master am: f8243e1e99
am: 851f42c54f
Change-Id: If7faeb235c1eeeab7902cbb9d62cc71d627e3130
|
2016-09-28 22:19:25 +00:00 |
|
Sreevani Sreejith
|
0308207792
|
Merge "Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev am: a0611bfd94" into nyc-dev-plus-aosp
am: 7b6f4889e4
Change-Id: I3a6cba95581048118a6d6216b9197d6701f47212
|
2016-09-28 22:17:53 +00:00 |
|
Sreevani Sreejith
|
356fd5047a
|
Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev am: a0611bfd94
am: 21156c7d6d
Change-Id: I366e60ba03948487f14ef0385d2767c5497e8de5
|
2016-09-28 22:17:51 +00:00 |
|
Bert McMeen
|
0ecb50002d
|
Merge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev
am: 90150e0c68
Change-Id: Ic59c8cb14d674fa6fe0d497977f955d8735348a3
|
2016-09-28 22:16:18 +00:00 |
|
Bert McMeen
|
fb089099ee
|
Docs: Preview 3 - Update to bridging of notifications
am: 1c3bccceb2
Change-Id: I7e86efdad1d9e142ce5363bfc45290f1da2a8ef2
|
2016-09-28 22:16:15 +00:00 |
|
sreevanis
|
636c42ead9
|
Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification. am: b00d08796b" into nyc-dev-plus-aosp
am: 017aff52d4
Change-Id: I46a670a6ffdfbe0f221021417f783807ee9594b8
|
2016-09-28 22:16:08 +00:00 |
|
sreevanis
|
175bd61873
|
docs: Added documentation for Inline action on notification stream and steps for adding images to a notification. am: b00d08796b
am: ff3c74c915
Change-Id: I2d6e9a4c838958f583fd3ead4608039487867367
|
2016-09-28 22:16:06 +00:00 |
|
Sreevani Sreejith
|
69426b3f3d
|
Merge "Merge "docs: Documentation for WearableRecyclerView." into nyc-dev am: de101dfbdc" into nyc-dev-plus-aosp
am: 75bd45688f
Change-Id: I188437ad1c5917faeb69900c628d750d8ceec65c
|
2016-09-28 22:14:37 +00:00 |
|
Sreevani Sreejith
|
34f736c3cf
|
Merge "docs: Documentation for WearableRecyclerView." into nyc-dev am: de101dfbdc
am: 493934caad
Change-Id: I0b83b05444cc279a007ae324d47846e055f3dd06
|
2016-09-28 22:14:33 +00:00 |
|
sreevanis
|
1e6e66ef80
|
Merge "docs: Documentation for WearableRecyclerView. am: 2d1a177045" into nyc-dev-plus-aosp
am: 865d57fe29
Change-Id: I8a50ed8787372eb78d13dbbe97fff138359cd195
|
2016-09-28 22:12:56 +00:00 |
|
sreevanis
|
e0306c0754
|
docs: Documentation for WearableRecyclerView. am: 2d1a177045
am: 7d5ccdaae9
Change-Id: Ic4e379496a08dd44132cdbef27c8171e0b7e72dd
|
2016-09-28 22:12:54 +00:00 |
|
Sreevani Sreejith
|
b4ed299d41
|
Merge "Merge "docs:Added Wear partner logos." into nyc-dev am: 9d5d25f842" into nyc-dev-plus-aosp
am: 7c8f1de31e
Change-Id: I29d212f0ee083bd0403144467100dda2ccc43f43
|
2016-09-28 22:11:38 +00:00 |
|
Sreevani Sreejith
|
35ff7c0786
|
Merge "docs:Added Wear partner logos." into nyc-dev am: 9d5d25f842
am: d677d6506c
Change-Id: I85b1936afc7d21c258d5027d2dbfabad45fb7434
|
2016-09-28 22:11:34 +00:00 |
|
sreevanis
|
eab082dbe5
|
Merge "docs:Added Wear partner logos. am: bfc1ba951e" into nyc-dev-plus-aosp
am: fb78be5e9f
Change-Id: Ice5af501f898228fde47ca76259b3036e14d4879
|
2016-09-28 22:09:58 +00:00 |
|
sreevanis
|
842bf350f9
|
docs:Added Wear partner logos. am: bfc1ba951e
am: 4f21a2c76f
Change-Id: Ib5efb8f07cb1afad69adc3b6809bbe8f1586f7f6
|
2016-09-28 22:09:55 +00:00 |
|
Bert McMeen
|
90150e0c68
|
Merge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev
|
2016-09-28 22:06:03 +00:00 |
|
Kenny Root
|
057b6c2b9a
|
DO NOT MERGE Track generics in API definition. am: ae0c402a45 -s ours
am: 9584c0e55f
Change-Id: I38b5c9d8743c27794ead07b0b14baab69a62a1a1
|
2016-09-28 22:04:30 +00:00 |
|
Android Build Merger (Role)
|
640780236c
|
Merge "Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master am: f8243e1e99" into nyc-dev-plus-aosp
|
2016-09-28 22:03:50 +00:00 |
|
Dianne Hackborn
|
518629ba34
|
DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API am: a327e3b3a7 -s ours
am: b76d44f3ce
Change-Id: Ibcee9dc973283afa9a78f6357018deb9034a006f
|
2016-09-28 22:03:45 +00:00 |
|
Android Build Merger (Role)
|
7b6f4889e4
|
Merge "Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev am: a0611bfd94" into nyc-dev-plus-aosp
|
2016-09-28 22:03:03 +00:00 |
|
Android Build Merger (Role)
|
017aff52d4
|
Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification. am: b00d08796b" into nyc-dev-plus-aosp
|
2016-09-28 22:02:43 +00:00 |
|
Sreevani Sreejith
|
21156c7d6d
|
Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev
am: a0611bfd94
Change-Id: Ie6f566aa8bbd0f8a79af768d528d0f317a13fd10
|
2016-09-28 22:01:51 +00:00 |
|
sreevanis
|
ff3c74c915
|
docs: Added documentation for Inline action on notification stream and steps for adding images to a notification.
am: b00d08796b
Change-Id: I5bf5ec8a0272d653ec71d57d233dc5155453d25d
|
2016-09-28 22:01:48 +00:00 |
|
Kenny Root
|
851f42c54f
|
Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master
am: f8243e1e99
Change-Id: I67553b5f49940723937cb9b3b84f4a4a9a5af9aa
|
2016-09-28 22:01:46 +00:00 |
|
Android Build Merger (Role)
|
75bd45688f
|
Merge "Merge "docs: Documentation for WearableRecyclerView." into nyc-dev am: de101dfbdc" into nyc-dev-plus-aosp
|
2016-09-28 22:01:30 +00:00 |
|
Android Build Merger (Role)
|
865d57fe29
|
Merge "docs: Documentation for WearableRecyclerView. am: 2d1a177045" into nyc-dev-plus-aosp
|
2016-09-28 22:01:08 +00:00 |
|
Sreevani Sreejith
|
493934caad
|
Merge "docs: Documentation for WearableRecyclerView." into nyc-dev
am: de101dfbdc
Change-Id: Ic4e856936adce9de9cc512eb63ccf715da213d3c
|
2016-09-28 22:00:25 +00:00 |
|
sreevanis
|
7d5ccdaae9
|
docs: Documentation for WearableRecyclerView.
am: 2d1a177045
Change-Id: I0f8c8af72bb85c01b465d6415d33d0a37bedda07
|
2016-09-28 22:00:20 +00:00 |
|
Android Build Merger (Role)
|
7c8f1de31e
|
Merge "Merge "docs:Added Wear partner logos." into nyc-dev am: 9d5d25f842" into nyc-dev-plus-aosp
|
2016-09-28 22:00:03 +00:00 |
|
Android Build Merger (Role)
|
fb78be5e9f
|
Merge "docs:Added Wear partner logos. am: bfc1ba951e" into nyc-dev-plus-aosp
|
2016-09-28 21:59:38 +00:00 |
|
Sreevani Sreejith
|
d677d6506c
|
Merge "docs:Added Wear partner logos." into nyc-dev
am: 9d5d25f842
Change-Id: Id1995a3badda8e32ed0b43ca1f692c98bfb6ffbd
|
2016-09-28 21:58:51 +00:00 |
|
sreevanis
|
4f21a2c76f
|
docs:Added Wear partner logos.
am: bfc1ba951e
Change-Id: Ie06dfabfdb62318a6e431d6448ef4cdce1b5eee6
|
2016-09-28 21:58:48 +00:00 |
|
Kenny Root
|
9584c0e55f
|
DO NOT MERGE Track generics in API definition.
am: ae0c402a45 -s ours
Change-Id: Ia1d55feccea94f34787498f37b8d20d33137bc16
|
2016-09-28 21:57:44 +00:00 |
|
Dianne Hackborn
|
b76d44f3ce
|
DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
am: a327e3b3a7 -s ours
Change-Id: Ifb5a69244f35a3cbca59cf3667b5eb0698eaab50
|
2016-09-28 21:56:34 +00:00 |
|
Sreevani Sreejith
|
a0611bfd94
|
Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev
|
2016-09-28 21:51:40 +00:00 |
|
Sreevani Sreejith
|
de101dfbdc
|
Merge "docs: Documentation for WearableRecyclerView." into nyc-dev
|
2016-09-28 21:50:40 +00:00 |
|
Sreevani Sreejith
|
9d5d25f842
|
Merge "docs:Added Wear partner logos." into nyc-dev
|
2016-09-28 21:50:13 +00:00 |
|
TreeHugger Robot
|
f8243e1e99
|
Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master
* changes:
DO NOT MERGE Track generics in API definition.
DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
|
2016-09-28 21:47:54 +00:00 |
|
Eino-Ville Talvala
|
deba87734b
|
Merge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev am: 4e3bb26f64
am: 64aba83098
Change-Id: I102949e4f93a70cfbfe846643526fb11b3808fc9
|
2016-09-28 21:39:18 +00:00 |
|
Eino-Ville Talvala
|
f6ea31d8f1
|
DngCreator: Do not cache timezone in static initializer am: ec727411d2
am: fa141e303e
Change-Id: I3174eb2adccc587761ab64e226eda6bd59e2295a
|
2016-09-28 21:36:29 +00:00 |
|
Vladislav Kuzkokov
|
935c306796
|
Merge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev am: cd339f211a
am: e36d393d74
Change-Id: I087cfcc70726bee2ebcf6f92302530f69ce58779
|
2016-09-28 21:35:30 +00:00 |
|
Vladislav Kuzkokov
|
da82fa0a3f
|
Fix logic in disabling BackupTransport in DO mode. am: bbaadc0166
am: cfaef4287d
Change-Id: I171072819fb93c671a30c7576c1150673a38c617
|
2016-09-28 21:34:35 +00:00 |
|
Vladislav Kuzkokov
|
dd01ce7bda
|
Merge "Fix backup for users hit by erroneous backup disabling" into nyc-mr1-dev am: a7d26d9171
am: 266a5747da
Change-Id: Iea1dc92b2e3b55b61f7a23f21dea1eed1ccaf4b3
|
2016-09-28 21:33:41 +00:00 |
|
Vladislav Kuzkokov
|
852c39433c
|
Fix backup for users hit by erroneous backup disabling am: 1975021d88
am: 56d7022d48
Change-Id: I200b204c07d77007a27b8462cf3e5b831b873b1d
|
2016-09-28 21:32:46 +00:00 |
|
Eino-Ville Talvala
|
64aba83098
|
Merge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev
am: 4e3bb26f64
Change-Id: Ice6815ac6922e53fa3ec3e7826cb9468dd4ce49d
|
2016-09-28 21:27:23 +00:00 |
|
Eino-Ville Talvala
|
fa141e303e
|
DngCreator: Do not cache timezone in static initializer
am: ec727411d2
Change-Id: I86d207b7bfd156f5296aa3f5ba5acecd2d762d4e
|
2016-09-28 21:27:21 +00:00 |
|
Vladislav Kuzkokov
|
e36d393d74
|
Merge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev
am: cd339f211a
Change-Id: I31dc7073d276b710d66cc977ee09cbfea2893e55
|
2016-09-28 21:26:02 +00:00 |
|