git.osdn.net Git - android-x86/frameworks-base.git/log

Scott Main [Tue, 20 Sep 2016 20:48:34 +0000 (20:48 +0000)]

Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev
am: a1c28fa8d8

Change-Id: Ie4f83b366682d442d15f9b6c256de4ff470e4d98

commit | commitdiff | tree

smain@google.com [Tue, 20 Sep 2016 20:48:29 +0000 (20:48 +0000)]

update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")
am: 0e98b64adf

Change-Id: I32c5ccc9feb7b39a681c8ac1f390b775da80e660

commit | commitdiff | tree

Scott Main [Tue, 20 Sep 2016 20:26:09 +0000 (20:26 +0000)]

Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev

commit | commitdiff | tree

smain@google.com [Mon, 19 Sep 2016 23:19:37 +0000 (16:19 -0700)]

update metadata for the studio landing page cards (for 2.2 content)
edit landing page banner ("a dozen" --> "20")

Change-Id: Iccad4faab12930eac9fe58b5c84ba08d444fbee6

commit | commitdiff | tree

Mary Yanchar [Tue, 20 Sep 2016 18:26:32 +0000 (18:26 +0000)]

Merge "Small change for new sample test code" into nyc-dev
am: e5e9265e09

Change-Id: I438a87121615d4cc3d77d6f7a508a453d555d385

commit | commitdiff | tree

Mary Yanchar [Tue, 20 Sep 2016 18:26:27 +0000 (18:26 +0000)]

Small change for new sample test code
am: acb3eb39da

Change-Id: I078e5e5781b19d1e403f3c98113597f958f04eab

commit | commitdiff | tree

Mary Yanchar [Tue, 20 Sep 2016 18:19:21 +0000 (18:19 +0000)]

Merge "Small change for new sample test code" into nyc-dev

commit | commitdiff | tree

Scott Main [Tue, 20 Sep 2016 17:07:22 +0000 (17:07 +0000)]

Merge changes from topic 'n-versioncode' into nyc-dev
am: 99ec81ab46

Change-Id: I75d6f0ca325f098161c1c30014a28ffc55e5de12

commit | commitdiff | tree

Dianne Hackborn [Tue, 20 Sep 2016 17:07:15 +0000 (17:07 +0000)]

A little more on issue #30766518: Document what targeting N does
am: da6be5b871

Change-Id: Ie1fdb2b07ff8fa016a82a1405336db0dac119fef

commit | commitdiff | tree

Dianne Hackborn [Tue, 20 Sep 2016 17:05:09 +0000 (17:05 +0000)]

Cherrypick so we can publish N version code description ASAP
am: 491bc2b8d6

Change-Id: I27da25afcaca61ac0159699c0cfc8fbf2338aa2c

commit | commitdiff | tree

Etan Cohen [Tue, 20 Sep 2016 16:58:32 +0000 (16:58 +0000)]

Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535
am: eb4c838c46

Change-Id: Ie03f1e3fbead74c4de77758163ad911e68e54b90

commit | commitdiff | tree

Scott Main [Tue, 20 Sep 2016 16:56:54 +0000 (16:56 +0000)]

Merge changes from topic 'n-versioncode' into nyc-dev

* changes:
A little more on issue #30766518: Document what targeting N does
Cherrypick so we can publish N version code description ASAP

commit | commitdiff | tree

Etan Cohen [Tue, 20 Sep 2016 16:50:01 +0000 (16:50 +0000)]

Merge "[NAN] Rename to make discovery explicit"
am: 5706a8f535

Change-Id: Ic71e0eced353dfdfb989876ddb4c11f4188625c5

commit | commitdiff | tree

Etan Cohen [Tue, 20 Sep 2016 16:41:04 +0000 (16:41 +0000)]

Merge "[NAN] Rename to make discovery explicit"

commit | commitdiff | tree

Rebecca Silberstein [Tue, 20 Sep 2016 16:04:40 +0000 (16:04 +0000)]

Merge "WifiScanner: retrieve single scan results" am: 3c70a2fad2
am: c507bcaf63

Change-Id: If67500edf13a396603c7fc4623457d46d7830f89

commit | commitdiff | tree

Rebecca Silberstein [Tue, 20 Sep 2016 15:58:17 +0000 (15:58 +0000)]

Merge "WifiScanner: retrieve single scan results"
am: 3c70a2fad2

Change-Id: I0db176ca82665c8b8089a5110074d5f1edf3738d

commit | commitdiff | tree

Rebecca Silberstein [Tue, 20 Sep 2016 15:50:07 +0000 (15:50 +0000)]

Merge "WifiScanner: retrieve single scan results"

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 09:08:13 +0000 (09:08 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 am: 1c2e8848dc -s ours
am: fba3187084

Change-Id: I31c7ea8fd66a380d1a7d7620af7c476026fa60d3

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 09:02:40 +0000 (09:02 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b -s ours
am: 4c77b60440

Change-Id: I6442a915afe8ffd685305d2f46d65719442ba70b

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 08:32:59 +0000 (08:32 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03
am: 1c2e8848dc -s ours

Change-Id: I8ef9e22473b93cc298273be517be4623b9ab1c1f

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 08:28:33 +0000 (08:28 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0
am: 5753af889b -s ours

Change-Id: I29a75431dd445026efde90f13a6e55fa59ec574d

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 08:00:37 +0000 (08:00 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours
am: 7efc56cc65

Change-Id: Ic8fab1cdbd0d1f5e078fab4185e20ce71777a743

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:34:19 +0000 (06:34 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c
am: badb5f2a03

Change-Id: Ic4099ba4eaac6bb50afe5811eacf85dd7759819c

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:33:24 +0000 (06:33 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492
am: 8d302da986 -s ours

Change-Id: I1c1edf783ae5c466ed8c89978de5d5dfd9adb643

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:32:39 +0000 (06:32 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9
am: 62c6ce4ca0

Change-Id: I1d0c04e3c4382f395d10034343240e1bf4bca68f

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:54:37 +0000 (05:54 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7
am: 7fd31ca09c

Change-Id: I36eecf20e2fc862daba195738363761b27e9fe8f

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:53:25 +0000 (05:53 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 am: 3c7e989835 -s ours
am: eacf98bf52

Change-Id: Ieff347e63bf42a009f60d1d0ba7c8eeb6cda37d7

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:53:17 +0000 (05:53 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc
am: 827f465492

Change-Id: I6113993dcd1aed053e5755deca2b115f5df8c5bd

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:51:05 +0000 (05:51 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea
am: 71bb55afd9

Change-Id: Id9ccdcb6bad4eddb355f2035049361c66a3a5f15

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:34:00 +0000 (05:34 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09
am: 8fedc773fc

Change-Id: I389e25a4d5bc24761cc7c2c9e94e45e5e6158453

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:23:59 +0000 (05:23 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours
am: 29e4cd66d7

Change-Id: Ib64a0085bfdb4a8e0a4d8d4b69b7434a0f8fdd4e

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:14:33 +0000 (05:14 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours
am: 1310d53aea

Change-Id: If01f2017d66da002d7e01fb28ffd49f0e84319d1

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:06:22 +0000 (05:06 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours
am: b235bc6f09

Change-Id: Id2d98d2f695f8884b5854e8fb1fbf406fda8fdb0

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 04:42:51 +0000 (04:42 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071
am: 3c7e989835 -s ours

Change-Id: Ieb72c957f1d58cea635bcd7b9449b19b3341efc8

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 04:11:52 +0000 (04:11 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15
am: 042fb63071

Change-Id: Ia7ea774c55524f67b9174bad90cb85bac034b246

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 03:26:43 +0000 (03:26 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547 am: 94b739d3a2 -s ours
am: 3f8c97465d

Change-Id: Ie214a5a36e35897f9124027a57d2d193a8f2a532

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 03:19:49 +0000 (03:19 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df
am: 2f0228c153 -s ours

Change-Id: Icd41b479bb5b365173e146791c1ee858f2265128

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 03:18:56 +0000 (03:18 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6 am: 2a2c463a01 -s ours
am: 9d3efc7882

Change-Id: Idfccebdd2c5d81a42799b9f97d1f9710ba45a95b

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:42:09 +0000 (02:42 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547
am: 94b739d3a2 -s ours

Change-Id: Ic622fadd075915e1ba78d6795bc9382d0c6bd131

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:42:00 +0000 (02:42 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2
am: 1b0debac62 -s ours

Change-Id: I60e0ac94a2f1147ce80419d429a9d4681e3a0c57

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:21:52 +0000 (02:21 +0000)]

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:21:46 +0000 (02:21 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12
am: 21d4b84547

Change-Id: I81c7ffac76c08c12dcefcc5977cc4f01b1dab606

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:21:42 +0000 (02:21 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6
am: 2a2c463a01 -s ours

Change-Id: Ib7fe0eba9cb3eeb4f42355dde3835753af1c2b5b

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:21:13 +0000 (02:21 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d
am: 923f622c15

Change-Id: I2962af1b07cd8102a471d3e0020e64dc50c94a04

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:20:58 +0000 (02:20 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8
am: fcc3d8fca2 -s ours

Change-Id: I1489cbfc74d97cb5e64cc712c480d556e227285e

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:00:05 +0000 (02:00 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55
am: 91ff18a1f6

Change-Id: I06ecd096731967b9ab0ad55ebb3fa12b3cea4247

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:38:53 +0000 (01:38 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad
am: c6d9bdded2

Change-Id: I854127259e85afb06046253c2d767f12439ae819

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:37:28 +0000 (01:37 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours
am: 20bafe850d

Change-Id: I58b5b4073af01991d5dc35b68807319a8e3749b1

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:36:48 +0000 (01:36 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours
am: af97c8805f

Change-Id: I7e65b0aae28bf10f3c84882990f9c26132709420

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:17:14 +0000 (01:17 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc
am: ac143d2dfd -s ours

Change-Id: I360338620a6607d882ac8dd13ec9cfbfc8381762

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:16:20 +0000 (01:16 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b
am: f428d49b12

Change-Id: I268ea392d2ebabb0ed5d3d74c02c1340d6067531

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:15:36 +0000 (01:15 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e am: fc2bef0139 -s ours
am: 011172a731

Change-Id: I67154d381d7e9313a3316550b2a991dc12b2cbde

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:59:50 +0000 (00:59 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours
am: 7f99a18e0e

Change-Id: I76fbf0ec1ded360147f280ce241b1d5751eb09db

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:59:15 +0000 (00:59 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours
am: 1781d2bd3b

Change-Id: I8a3eb8c29b34e74bad807485767bf4e2083c539d

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:33:59 +0000 (00:33 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4
am: 6b77a4ee55

Change-Id: I04fdab0c6677eb8c5d6ec50ab82a4e1f9da2180f

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:33:56 +0000 (00:33 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e
am: fc2bef0139 -s ours

Change-Id: Ie957e5ca85ad212891574b0a5a932fde4c565ede

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:13:24 +0000 (00:13 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f
am: e8e30122e8

Change-Id: Ifae0a5532d455931e6f3dd01c2273e6fd21d3f07

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:13:19 +0000 (00:13 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416
am: 6f170618ff -s ours

Change-Id: I862c56f9db4ac9161dc155dc9f469909e30b0c61

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:13:13 +0000 (00:13 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6
am: 018d1e7e1e

Change-Id: Ide3eaf333a2a1e3ef60ec0fb6e9ead1a0517c327

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:13:07 +0000 (00:13 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours
am: 51bcb058ad

Change-Id: If639ceb911ea7cfc977bf053f1e897bd7939564f

commit | commitdiff | tree

Kevin Hufnagle [Tue, 20 Sep 2016 00:12:52 +0000 (00:12 +0000)]

Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev
am: c60146d808

Change-Id: I0133f5c1ca953fc6b25ce2dcd5cb143d330ddef4

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:12:50 +0000 (00:12 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours
am: 1d053b3be8 -s ours

Change-Id: I359bae35d6698349370b4f9a51427f10eb2bbdf3

commit | commitdiff | tree

Kevin Hufnagle [Tue, 20 Sep 2016 00:12:18 +0000 (00:12 +0000)]

docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide
am: 49ed3eb8bc

Change-Id: I45ad88b8d26459f88506115b91880fe7b5cb1d2b

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:11:54 +0000 (00:11 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5
am: 426ba52b42 -s ours

Change-Id: I861ed40fa031d4add94e48b2fbbfb965ef1ca7d2

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 23:25:14 +0000 (23:25 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours
am: e44f8fcca4

Change-Id: I8c985dee46cceb5ad8cf3beb6ac9839d9a9d2058

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 23:24:48 +0000 (23:24 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf
am: 3fca892d3e -s ours

Change-Id: I4d66089c6ec8743f119dd4aab641b22ebdad7b5c

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 23:23:01 +0000 (23:23 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6
am: f4844b3416

Change-Id: Ic9c96ac3d030ebb0ac53a48686b541a0182795cb

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 23:22:39 +0000 (23:22 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a
am: e85152c2fc

Change-Id: Iff935eccf136c6c85b2373cfd113e9f6d6d9c9fc

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 23:22:33 +0000 (23:22 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0
am: 96d70301e6

Change-Id: I9ec98a60d61bbafd25be9d85f31b3086cef59779

commit | commitdiff | tree

Etan Cohen [Mon, 19 Sep 2016 23:06:44 +0000 (23:06 +0000)]

Merge "[NAN] Update API: replace looper with handler" am: 0027ddf990
am: c074f1bb7f

Change-Id: Ie13e48d42331aec21ca573e8540eb4305c60655d

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 23:04:23 +0000 (23:04 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb
am: 271aa24036 -s ours

Change-Id: Icaccd5612147cad9679f98476cf92bb3216e94f1

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 23:02:54 +0000 (23:02 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours
am: ff9a8d74c7 -s ours

Change-Id: I14d6109858bcf02b5f55eb3e207d6bc1918e746a

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 22:45:40 +0000 (22:45 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49
am: 94da8023d5

Change-Id: Iedc174184adc89009ce498558a496b72d1c31a05

commit | commitdiff | tree

Kevin Hufnagle [Mon, 19 Sep 2016 22:40:16 +0000 (22:40 +0000)]

Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev

commit | commitdiff | tree

Mary Yanchar [Wed, 14 Sep 2016 22:33:29 +0000 (15:33 -0700)]

Small change for new sample test code

Making a very small change to mention the example instrumented tests,
since the new code now matches the setup described in this tutorial.

Bug: 28932254
Change-Id: I1bcaa858a1e51609f0ab2863e2738f7aed96c01a

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 22:35:55 +0000 (22:35 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5
am: 5c53e1b8bb

Change-Id: Icd67597290378b8b62328cbfafa35fd0fc0497b6

commit | commitdiff | tree

Etan Cohen [Mon, 19 Sep 2016 22:28:57 +0000 (22:28 +0000)]

Merge "[NAN] Update API: replace looper with handler"
am: 0027ddf990

Change-Id: I6d3934255c9c6e8085830eeab527479b292bac07

commit | commitdiff | tree

Etan Cohen [Wed, 14 Sep 2016 21:41:56 +0000 (14:41 -0700)]

[NAN] Rename to make discovery explicit

Pure rename operation - no other functional changes.

(cherry-pick of commit ddb5f646562f31d7e78778a978e546f85312b009)

Bug: 31470256
Test: unit tests, integrated (sl4a) tests.
Change-Id: I5110d1a673b7ba4e39350d723b5984586fec585a

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 21:50:49 +0000 (21:50 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1
am: c1b2e6db98 -s ours

Change-Id: I006233ce7258467da7d5c09c9925bd6048d85ed3

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 21:50:47 +0000 (21:50 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79
am: a4c9bbefdf

Change-Id: I224c2cf56d53acf091a11372f82d1305052c6f18

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 21:49:26 +0000 (21:49 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours
am: 43a1f74d7f

Change-Id: I541e01b2d5d76a49908bd3c1557de9ba84a2cc3d

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 21:03:16 +0000 (21:03 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b
am: 2f44f906a6

Change-Id: I389ab319b133296296f3e7fe6aa44b9f208748bd

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 21:02:53 +0000 (21:02 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb
am: a437e7f3f1

Change-Id: I13fdcfc2ecca2e5e1d178d61ef8ec6990a0fc3af

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 20:58:08 +0000 (20:58 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours
am: bab9c1006a

Change-Id: Iab381b1ab450997c5835b68e8dc25e14d8ee34f1

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 20:47:39 +0000 (20:47 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev
am: 900550de49

Change-Id: I16a545056d2fc3404164a1b63ef79165f46e54f1

commit | commitdiff | tree

Etan Cohen [Mon, 19 Sep 2016 20:47:36 +0000 (20:47 +0000)]

Merge "[NAN] Update API: replace looper with handler"

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 20:47:35 +0000 (20:47 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am: e8340a9ed5

Change-Id: I52277ddde0b68b3be1764f325d04601e48a1cb1e

commit | commitdiff | tree

Etan Cohen [Fri, 9 Sep 2016 20:36:52 +0000 (13:36 -0700)]

[NAN] Update API: replace looper with handler

Per API council guidelines.

(cherry-pick of commit 0ff5bf0092eb25f579e2e93fb2f93bc953b39211)

Bug: 31377060
Test: unit tests, integrated (sl4a) tests
Change-Id: I05142001fb593399fb4675fbec965d7e08e0fac1

commit | commitdiff | tree

Cuihtlauac ALVARADO [Mon, 19 Sep 2016 20:45:31 +0000 (20:45 +0000)]

Merge "Fix parameter description" am: 750b523aa2
am: df5f3e6db8

Change-Id: Ia6b8efc3a910188f48f10abc3f0fc5d2e7d36146

commit | commitdiff | tree

Cuihtlauac ALVARADO [Mon, 19 Sep 2016 20:26:56 +0000 (20:26 +0000)]

Merge "Fix parameter description"
am: 750b523aa2

Change-Id: I5edb7e6910b92d3c2f93a61fc9e68489ece8e72f

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 20:16:23 +0000 (20:16 +0000)]

Merge "Fix deadlock in AcitivityManagerService." into nyc-dev
am: e70ebd694b

Change-Id: I7ff533b33ef48ffe82954937eb68a212e17001c0

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 20:16:17 +0000 (20:16 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev
am: d1e3e53d79

Change-Id: Id794cb9cd3792317d2786671f2f84a6ad8bbd404

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 20:16:16 +0000 (20:16 +0000)]

Fix deadlock in AcitivityManagerService.
am: 67e05b4d28

Change-Id: Ie590be7c82c693691e69a5855602c4ed5499c428

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 20:16:13 +0000 (20:16 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am: dce4be63bb

Change-Id: Ia1db0d226d84ed07da6712f554327b49c9fe59c0

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 20:16:00 +0000 (20:16 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev
am: 38077274d0

Change-Id: I10b7e25858e63110a63b4e92742c1305f0e9eed0

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 20:15:56 +0000 (20:15 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am: b59e73613b

Change-Id: Ibb2cba35ebedc884247c189a214ccce396333342

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 20:14:20 +0000 (20:14 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev
am: b358ee3558 -s ours

Change-Id: Idf726fba98ec0e78135498248d111d8571324657

commit | commitdiff | tree

Sudheer Shanka [Mon, 19 Sep 2016 20:14:16 +0000 (20:14 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am: 2d608378f4 -s ours

Change-Id: Ie6c10a3ef11ea0ec560f20ef49f14f46184d1a4d

commit | commitdiff | tree

Dianne Hackborn [Wed, 10 Aug 2016 01:00:31 +0000 (18:00 -0700)]

A little more on issue #30766518: Document what targeting N does

(cherry picked from commit 5f1649e85293428850659e35a52d812416812704)

Change-Id: Ieaad1f3ddfa7ef3444e3b513181555f87ecb8c3f

commit | commitdiff | tree

Treehugger Robot [Mon, 19 Sep 2016 20:02:27 +0000 (20:02 +0000)]