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

Andrew Solovay [Tue, 14 Jun 2016 21:23:34 +0000 (21:23 +0000)]

Merge \\\"docs: Updated support library revisions page for 24.0.0\\\" into nyc-dev am: eb4e8105d3 am: f1a2347d04
am: 6a2565a90a

Change-Id: If15f769ec3bfdc0a1840e322d31c27d43707889d

commit | commitdiff | tree

Daniel Yu [Tue, 14 Jun 2016 21:23:31 +0000 (21:23 +0000)]

Merge \\\\\"docs: Clarifying direct boot notification messages\\\\\" into mnc-io-docs am: 120fd583d5 am: 4c5e5ec6d5 am: 189ef624d1 am: bae1198640
am: e6d7cf1786

Change-Id: Idf3d30c197b02e1ba26cb3d4442d99dfe66fb0a5

commit | commitdiff | tree

Andrew Solovay [Tue, 14 Jun 2016 21:00:27 +0000 (21:00 +0000)]

Merge \\"docs: Updated support library revisions page for 24.0.0\\" into nyc-dev am: eb4e8105d3
am: f1a2347d04

Change-Id: Ic8854357354b3ad9a866f547bc90bbc829b3ff38

commit | commitdiff | tree

Andrew Solovay [Tue, 14 Jun 2016 20:53:58 +0000 (20:53 +0000)]

Merge \"docs: Updated support library revisions page for 24.0.0\" into nyc-dev
am: eb4e8105d3

Change-Id: I4f53b453d1b72d6051b50e3ec3dd979020ea7c6a

commit | commitdiff | tree

Dan Yu [Tue, 14 Jun 2016 20:52:24 +0000 (20:52 +0000)]

Merge \\\\"docs: Clarifying direct boot notification messages\\\\" into mnc-io-docs am: 120fd583d5 am: 4c5e5ec6d5 am: 189ef624d1
am: bae1198640

Change-Id: I691d5e8580d346d08cbaa18d2f3de730922dabd7

commit | commitdiff | tree

Daniel Yu [Tue, 14 Jun 2016 20:44:13 +0000 (20:44 +0000)]

Merge \\\\\"docs: Clarifying direct boot notification messages\\\\\" into mnc-io-docs am: 120fd583d5 am: 4c5e5ec6d5 am: 189ef624d1 am: 2b5c6303f9
am: e8c07d5d3f

Change-Id: Icc857ec3baaa3cc76255cda04bd40a723bcbc5a0

commit | commitdiff | tree

TreeHugger Robot [Tue, 14 Jun 2016 20:36:28 +0000 (20:36 +0000)]

Merge "docs: Updated support library revisions page for 24.0.0" into nyc-dev

commit | commitdiff | tree

Dan Yu [Tue, 14 Jun 2016 20:13:29 +0000 (20:13 +0000)]

Merge \\\\"docs: Clarifying direct boot notification messages\\\\" into mnc-io-docs am: 120fd583d5 am: 4c5e5ec6d5 am: 189ef624d1
am: 2b5c6303f9

Change-Id: I9d1613270a53d0753c0de092635455d4f9759a0a

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 20:13:18 +0000 (20:13 +0000)]

Merge \\\"Improve action bar transition\\\" into nyc-dev am: 207cbee824 am: 3b8d38af16
am: 925ad9ef58

Change-Id: I331bec9c109ca65a0929529d46df5ea6750c11a1

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 20:07:14 +0000 (20:07 +0000)]

Merge \\\"Improve action bar transition\\\" into nyc-dev am: 207cbee824 am: a2b932892c
am: 7791ab8f39

Change-Id: I38004c2514dbad1941f302e4429b0d37d0cf5148

commit | commitdiff | tree

Daniel Yu [Tue, 14 Jun 2016 20:07:13 +0000 (20:07 +0000)]

Merge \\\"docs: Clarifying direct boot notification messages\\\" into mnc-io-docs am: 120fd583d5 am: 4c5e5ec6d5
am: 189ef624d1

Change-Id: I2d7a53764f2449303efb0163647498a56098b368

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 20:07:11 +0000 (20:07 +0000)]

Merge \\"Update AssistDisclosure animation\\" into nyc-mr1-dev am: 16541c60ad
am: ea351aa3dd

Change-Id: I23f9967fd057faa3c0455c1280010628a75a52e0

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 20:07:06 +0000 (20:07 +0000)]

Merge \\\"Fix jittery action bar during transitions\\\" into nyc-dev am: 8507d98ad1 am: 746a64493b
am: a19f4b9808

Change-Id: I7e81e516bd20960f235eb70ea1818c9588bbcafb

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 20:07:03 +0000 (20:07 +0000)]

Merge \\\"Make RemoteView margins density-change safe\\\" into nyc-dev am: 26e864c398 am: ba38cc6992
am: cc4d80e58e

Change-Id: I5448a61db3e82299cd5ff8e4258654d25717e028

commit | commitdiff | tree

Daniel Yu [Tue, 14 Jun 2016 20:07:00 +0000 (20:07 +0000)]

Merge \\\"docs: Clarifying direct boot notification messages\\\" into mnc-io-docs am: 120fd583d5 am: 4c5e5ec6d5
am: 189ef624d1

Change-Id: I8dd09259cd766055b3fff690cb4bbc12d871ec85

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 20:02:37 +0000 (20:02 +0000)]

Merge \\"Improve action bar transition\\" into nyc-dev am: 207cbee824
am: 3b8d38af16

Change-Id: Ie5bcd7af600e519ae06fbfd4235457a3a1f3cb41

commit | commitdiff | tree

Dan Yu [Tue, 14 Jun 2016 19:59:36 +0000 (19:59 +0000)]

Merge \\"docs: Clarifying direct boot notification messages\\" into mnc-io-docs am: 120fd583d5
am: 4c5e5ec6d5

Change-Id: I2bfe82b79c928d10b7725315d42b00a1994bbd52

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:59:08 +0000 (19:59 +0000)]

Merge \\"Improve action bar transition\\" into nyc-dev am: 207cbee824
am: a2b932892c

Change-Id: Id0561a90e8f855a819d5bf759c192f50e8c114ad

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:59:05 +0000 (19:59 +0000)]

Merge \"Update AssistDisclosure animation\" into nyc-mr1-dev
am: 16541c60ad

Change-Id: I7ac13b511d5b32bf6041626035b1bb249a4aa0d0

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:59:02 +0000 (19:59 +0000)]

Merge \\\"Fix jittery action bar during transitions\\\" into nyc-dev am: 8507d98ad1 am: 2c50962538
am: f381297dea

Change-Id: Ia8149d27d7d44fc311d9cb446c2f3844dd5b73fb

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:59:01 +0000 (19:59 +0000)]

Merge \\"Fix jittery action bar during transitions\\" into nyc-dev am: 8507d98ad1
am: 746a64493b

Change-Id: I323df8edff134978e38ae100c96e6b580d6f1290

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:58:59 +0000 (19:58 +0000)]

Merge \\\"Make RemoteView margins density-change safe\\\" into nyc-dev am: 26e864c398 am: 06976edc0b
am: eac63514e4

Change-Id: Iff68d2db9b83b7f43524a39e280463b8462f5f00

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:58:58 +0000 (19:58 +0000)]

Merge \\"Make RemoteView margins density-change safe\\" into nyc-dev am: 26e864c398
am: ba38cc6992

Change-Id: I4ebb82d1c22f61c550f5aae967c75940812c4260

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:56:59 +0000 (19:56 +0000)]

Merge \"Improve action bar transition\" into nyc-dev
am: 207cbee824

Change-Id: I9fe03bc7409f2631aa8b7a5d1d2a8542d4a1fd3c

commit | commitdiff | tree

Daniel Yu [Tue, 14 Jun 2016 19:53:35 +0000 (19:53 +0000)]

Merge \"docs: Clarifying direct boot notification messages\" into mnc-io-docs
am: 120fd583d5

Change-Id: I076e69e0a0497ed461dc576b72419152e89bb010

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:53:31 +0000 (19:53 +0000)]

Merge \\"Fix jittery action bar during transitions\\" into nyc-dev am: 8507d98ad1
am: 2c50962538

Change-Id: Ibb907f480b0c11839a2fc33ec95ff77b8a54b244

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:53:25 +0000 (19:53 +0000)]

Merge \\"Make RemoteView margins density-change safe\\" into nyc-dev am: 26e864c398
am: 06976edc0b

Change-Id: I2f59abdfcfd28876995b98b13ce15a40d601ca3f

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:53:02 +0000 (19:53 +0000)]

Merge \"Improve action bar transition\" into nyc-dev
am: 207cbee824

Change-Id: I80f11763de99bb9890e91663efe99fd437a5366f

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:49:56 +0000 (19:49 +0000)]

Merge "Update AssistDisclosure animation" into nyc-mr1-dev

commit | commitdiff | tree

Dan Yu [Tue, 14 Jun 2016 19:49:11 +0000 (19:49 +0000)]

Merge "docs: Clarifying direct boot notification messages" into mnc-io-docs

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 14 Jun 2016 19:46:31 +0000 (19:46 +0000)]

Merge "Merge \\"Added customizable default system theme.\\" into nyc-mr1-dev am: e57e9e5096 am: f9dc08e944"

commit | commitdiff | tree

Michael Kwan [Tue, 14 Jun 2016 19:46:08 +0000 (19:46 +0000)]

Merge \\"Added customizable default system theme.\\" into nyc-mr1-dev am: e57e9e5096
am: f9dc08e944

Change-Id: I17ebe9ec5aeef7c97bee43730dec76a71d456da1

commit | commitdiff | tree

Richard Ho [Tue, 14 Jun 2016 19:45:47 +0000 (19:45 +0000)]

Merge "added null check in doInBackground and if null, properly intializes variables"

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:42:40 +0000 (19:42 +0000)]

Merge "Improve action bar transition" into nyc-dev

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:42:03 +0000 (19:42 +0000)]

Merge \"Fix jittery action bar during transitions\" into nyc-dev
am: 8507d98ad1

Change-Id: I398e98789bd7ebac32289a0a84ba9ab3393fb70e

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:41:59 +0000 (19:41 +0000)]

Merge \"Make RemoteView margins density-change safe\" into nyc-dev
am: 26e864c398

Change-Id: I9fb7b321751443c750ee8acb0190a79dd8669941

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:41:57 +0000 (19:41 +0000)]

Merge \"Fix jittery action bar during transitions\" into nyc-dev
am: 8507d98ad1

Change-Id: I1a445bc9ce438432643f94ec912b7838b55849dd

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:41:54 +0000 (19:41 +0000)]

Merge \"Make RemoteView margins density-change safe\" into nyc-dev
am: 26e864c398

Change-Id: I3098eb8a803de7bc471bb362a2eb01b7f6d473ce

commit | commitdiff | tree

Michael Kwan [Tue, 14 Jun 2016 19:41:48 +0000 (19:41 +0000)]

Merge \"Added customizable default system theme.\" into nyc-mr1-dev
am: e57e9e5096

Change-Id: I304fb65ef724c2a08c0ad6ed9805fc5f8683d6cc

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:31:24 +0000 (19:31 +0000)]

Merge "Fix jittery action bar during transitions" into nyc-dev

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jun 2016 19:31:12 +0000 (19:31 +0000)]

Merge "Make RemoteView margins density-change safe" into nyc-dev

commit | commitdiff | tree

Michael Kwan [Tue, 14 Jun 2016 19:26:57 +0000 (19:26 +0000)]

Merge "Added customizable default system theme." into nyc-mr1-dev

commit | commitdiff | tree

Shreyas Basarge [Tue, 14 Jun 2016 19:14:44 +0000 (19:14 +0000)]

Merge \\\"Update SyncManager min period to match JobScheduler\\\" into nyc-dev am: 166b0abf13 am: 24d50f8f0a
am: 3c365b41c6

Change-Id: I64a026b13dde2cd8e029775e67270e8db5234910

commit | commitdiff | tree

Shreyas Basarge [Tue, 14 Jun 2016 19:10:05 +0000 (19:10 +0000)]

Merge \"Merge \\\"Update SyncManager min period to match JobScheduler\\\" into nyc-dev am: 166b0abf13 am: 85cd35b1dc\" into nyc-mr1-dev-plus-aosp
am: 425c35e728

Change-Id: I333c60cfb14ef5f7ea4ccde53c9fc61088c048e2

commit | commitdiff | tree

Wei Jia [Tue, 14 Jun 2016 19:10:01 +0000 (19:10 +0000)]

Merge \\\"MediaPlayer: fix java doc for setSurface and setDisplay.\\\" into nyc-dev am: c6f39a0c36 am: 6a58862af8
am: 16df6cd377

Change-Id: I052e18285d1d797a9698e1be9baed3dcfe166205

commit | commitdiff | tree

Shreyas Basarge [Tue, 14 Jun 2016 19:09:49 +0000 (19:09 +0000)]

Merge \\"Update SyncManager min period to match JobScheduler\\" into nyc-dev am: 166b0abf13
am: 24d50f8f0a

Change-Id: I2788a38bd8ea77df847444556f4ca7a98c5c956e

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 14 Jun 2016 19:05:35 +0000 (19:05 +0000)]

Merge "Merge \\"Update SyncManager min period to match JobScheduler\\" into nyc-dev am: 166b0abf13 am: 85cd35b1dc" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Shreyas Basarge [Tue, 14 Jun 2016 19:05:05 +0000 (19:05 +0000)]

Merge \\"Update SyncManager min period to match JobScheduler\\" into nyc-dev am: 166b0abf13
am: 85cd35b1dc

Change-Id: Id7f841a749258deb2448e16bdcbe4b0a67687fa0

commit | commitdiff | tree

Wei Jia [Tue, 14 Jun 2016 19:05:00 +0000 (19:05 +0000)]

Merge \\\"MediaPlayer: fix java doc for setSurface and setDisplay.\\\" into nyc-dev am: c6f39a0c36 am: ffd09065a3
am: 8a924cae8e

Change-Id: Ice8a126a15cf15886b768957107012436df1b6fd

commit | commitdiff | tree

Shreyas Basarge [Tue, 14 Jun 2016 19:04:02 +0000 (19:04 +0000)]

Merge \"Update SyncManager min period to match JobScheduler\" into nyc-dev
am: 166b0abf13

Change-Id: I8cfeb60e96a58d6778488c1b4c3ce9565a11bf88

commit | commitdiff | tree

Wei Jia [Tue, 14 Jun 2016 19:03:59 +0000 (19:03 +0000)]

Merge \\"MediaPlayer: fix java doc for setSurface and setDisplay.\\" into nyc-dev am: c6f39a0c36
am: 6a58862af8

Change-Id: Iddc938da39edfc02e7d7fca31a9840725005133f

commit | commitdiff | tree

Wei Jia [Tue, 14 Jun 2016 18:59:56 +0000 (18:59 +0000)]

Merge \\"MediaPlayer: fix java doc for setSurface and setDisplay.\\" into nyc-dev am: c6f39a0c36
am: ffd09065a3

Change-Id: I5ac47afdfa0b5e6cd59d3423eea12b9cad3a31d5

commit | commitdiff | tree

Shreyas Basarge [Tue, 14 Jun 2016 18:59:54 +0000 (18:59 +0000)]

Merge \"Update SyncManager min period to match JobScheduler\" into nyc-dev
am: 166b0abf13

Change-Id: I456f660a5e336b7151469b904bed92b4cbd617b7

commit | commitdiff | tree

Wei Jia [Tue, 14 Jun 2016 18:58:55 +0000 (18:58 +0000)]

Merge \"MediaPlayer: fix java doc for setSurface and setDisplay.\" into nyc-dev
am: c6f39a0c36

Change-Id: I1c6dea8e60e96804c9d7564b367c21b146728072

commit | commitdiff | tree

Wei Jia [Tue, 14 Jun 2016 18:56:05 +0000 (18:56 +0000)]

Merge \"MediaPlayer: fix java doc for setSurface and setDisplay.\" into nyc-dev
am: c6f39a0c36

Change-Id: I650941fee78fa9cefcc349e299865103e15216d2

commit | commitdiff | tree

Shreyas Basarge [Tue, 14 Jun 2016 18:54:43 +0000 (18:54 +0000)]

Merge "Update SyncManager min period to match JobScheduler" into nyc-dev

commit | commitdiff | tree

Wei Jia [Tue, 14 Jun 2016 18:50:00 +0000 (18:50 +0000)]

Merge "MediaPlayer: fix java doc for setSurface and setDisplay." into nyc-dev

commit | commitdiff | tree

Andrew Solovay [Tue, 14 Jun 2016 18:46:18 +0000 (18:46 +0000)]

Merge \\\"docs: Updating N download pages for DP4\\\" into nyc-dev am: f2d5d876b9 am: b0cba526b1
am: b9cabc7fcc

Change-Id: I02d810bf71c9bb26182eac5612ac9b9afce8610d

commit | commitdiff | tree

Andrew Solovay [Tue, 14 Jun 2016 18:46:13 +0000 (18:46 +0000)]

Merge \\\"docs: Updating N download pages for DP4\\\" into nyc-dev am: f2d5d876b9 am: 3b023c5882
am: 21f9cb4909

Change-Id: I3e7af608a045d6bc94b9d79d5fa30eca25b49e7f

commit | commitdiff | tree

Makoto Onuki [Tue, 14 Jun 2016 18:43:06 +0000 (18:43 +0000)]

Merge \"Merge \\\"Don\\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\\" into nyc-dev am: 5e94a16b74 am: e220722bdf\" into nyc-mr1-dev-plus-aosp
am: 5d4c54f570

Change-Id: If8610b5efc9895629fe37375b181bbe7e64ba389

commit | commitdiff | tree

Andrew Solovay [Tue, 14 Jun 2016 18:41:31 +0000 (18:41 +0000)]

Merge \\"docs: Updating N download pages for DP4\\" into nyc-dev am: f2d5d876b9
am: b0cba526b1

Change-Id: I4c6ae26f18b693660f99cf458c209038749cb37d

commit | commitdiff | tree

Andrew Solovay [Tue, 14 Jun 2016 18:38:30 +0000 (18:38 +0000)]

Merge \\"docs: Updating N download pages for DP4\\" into nyc-dev am: f2d5d876b9
am: 3b023c5882

Change-Id: I8a068a9b750b3105cfbe91f33157586acc2cca06

commit | commitdiff | tree

Adrian Roos [Wed, 1 Jun 2016 22:09:42 +0000 (15:09 -0700)]

Update AssistDisclosure animation

- Remove the tracing
- Fade in for 400ms, fade out for 300ms
- Fade in to 87%

Fixes: 29061746
Change-Id: Ic1e1e4d5bca7da0db78a4f33e8df5000553d7585

commit | commitdiff | tree

Makoto Onuki [Tue, 14 Jun 2016 18:37:54 +0000 (18:37 +0000)]

Merge \\\"Don\\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\\" into nyc-dev am: 5e94a16b74 am: f7c91b8838
am: df30e75294

Change-Id: I10e8d8fe5af249ee93baa3586cf43e048b0805dd

commit | commitdiff | tree

Hemal Patel [Tue, 14 Jun 2016 18:33:24 +0000 (18:33 +0000)]

Merge \"Merge \\\"Docs: Changed a command in Keyboard Shortcuts\\\" into nyc-dev am: d0067507be am: 6d6429eff0\" into nyc-mr1-dev-plus-aosp
am: ad63763812

Change-Id: I99c05ba431a58b437a7d0ede25bb867f981822b5

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 14 Jun 2016 18:33:08 +0000 (18:33 +0000)]

Merge "Merge \\"Don\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\" into nyc-dev am: 5e94a16b74 am: e220722bdf" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Andrew Solovay [Tue, 14 Jun 2016 18:32:54 +0000 (18:32 +0000)]

Merge \"docs: Updating N download pages for DP4\" into nyc-dev
am: f2d5d876b9

Change-Id: I30d07c84d858d3ca262320525082c7cf8a5e1c3a

commit | commitdiff | tree

Makoto Onuki [Tue, 14 Jun 2016 18:32:40 +0000 (18:32 +0000)]

Merge \\"Don\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\" into nyc-dev am: 5e94a16b74
am: e220722bdf

Change-Id: Ia5a36670bc214f853c9c612069c3cc3f8201c564

commit | commitdiff | tree

Makoto Onuki [Tue, 14 Jun 2016 18:32:35 +0000 (18:32 +0000)]

Merge \\"Don\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\" into nyc-dev am: 5e94a16b74
am: f7c91b8838

Change-Id: Idbbc9d23187489903ecd27d3c24d688464d1273c

commit | commitdiff | tree

Hemal Patel [Tue, 14 Jun 2016 18:29:56 +0000 (18:29 +0000)]

Merge \\\"Docs: Changed a command in Keyboard Shortcuts\\\" into nyc-dev am: d0067507be am: 2c95fb071e
am: 0f5d210349

Change-Id: I67989019c10f40d57f8e9aed709b889dc37f04d8

commit | commitdiff | tree

Andrew Solovay [Tue, 14 Jun 2016 18:29:01 +0000 (18:29 +0000)]

Merge \"docs: Updating N download pages for DP4\" into nyc-dev
am: f2d5d876b9

Change-Id: Id2fd197a8778cbb82508ecd75ed183f3ff775be8

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 14 Jun 2016 18:26:36 +0000 (18:26 +0000)]

Merge "Merge \\"Docs: Changed a command in Keyboard Shortcuts\\" into nyc-dev am: d0067507be am: 6d6429eff0" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Hemal Patel [Tue, 14 Jun 2016 18:26:13 +0000 (18:26 +0000)]

Merge \\"Docs: Changed a command in Keyboard Shortcuts\\" into nyc-dev am: d0067507be
am: 6d6429eff0

Change-Id: I26b8303296002c17058b196f17e17d9fb29a9723

commit | commitdiff | tree

Makoto Onuki [Tue, 14 Jun 2016 18:26:00 +0000 (18:26 +0000)]

Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
am: 5e94a16b74

Change-Id: I61c3582d8b51124b33b39249f20bdfe71e764a69

commit | commitdiff | tree

Makoto Onuki [Tue, 14 Jun 2016 18:25:25 +0000 (18:25 +0000)]

Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
am: 5e94a16b74

Change-Id: I7e4d1044616bdb6e88c96dc1f79ab683b760bc5a

commit | commitdiff | tree

Hemal Patel [Tue, 14 Jun 2016 18:25:15 +0000 (18:25 +0000)]

Merge \\"Docs: Changed a command in Keyboard Shortcuts\\" into nyc-dev am: d0067507be
am: 2c95fb071e

Change-Id: I454ae29c7df403d361b4b677fbc40ed54c8faa2e

commit | commitdiff | tree

TreeHugger Robot [Tue, 14 Jun 2016 18:20:48 +0000 (18:20 +0000)]

Merge "docs: Updating N download pages for DP4" into nyc-dev

commit | commitdiff | tree

Hemal Patel [Tue, 14 Jun 2016 18:19:54 +0000 (18:19 +0000)]

Merge \"Docs: Changed a command in Keyboard Shortcuts\" into nyc-dev
am: d0067507be

Change-Id: Id30ee255e889c18cba0ab43cd9d0759e35dd53b7

commit | commitdiff | tree

Hemal Patel [Tue, 14 Jun 2016 18:19:54 +0000 (18:19 +0000)]

Merge \"Docs: Changed a command in Keyboard Shortcuts\" into nyc-dev
am: d0067507be

Change-Id: If859676fdcddcb2e21bbb027e91ac6b73303f68a

commit | commitdiff | tree

Makoto Onuki [Tue, 14 Jun 2016 18:17:00 +0000 (18:17 +0000)]

Merge "Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent" into nyc-dev

commit | commitdiff | tree

Hemal Patel [Tue, 14 Jun 2016 18:11:09 +0000 (18:11 +0000)]

Merge "Docs: Changed a command in Keyboard Shortcuts" into nyc-dev

commit | commitdiff | tree

Richard Ho [Mon, 13 Jun 2016 23:54:04 +0000 (16:54 -0700)]

added null check in doInBackground and if null, properly intializes
variables

Bug:29234237
Change-Id: I1d65b1a232c71efdd11a917769aec5044867a085

commit | commitdiff | tree

Aurimas Liutikas [Tue, 14 Jun 2016 18:01:14 +0000 (18:01 +0000)]

Merge \\\\\"Fix broken {@docRoot} links\\\\\" into mnc-io-docs am: a0fa50e40b am: 423fe7db6a am: 68d5e4b9ff am: 96262fb498
am: 044825e238

Change-Id: Ic687149f1b21b165880c270f98de0a799975fdd0

commit | commitdiff | tree

Aurimas Liutikas [Tue, 14 Jun 2016 17:57:06 +0000 (17:57 +0000)]

Merge \\\\\"Fix broken {@docRoot} links\\\\\" into mnc-io-docs am: a0fa50e40b am: 423fe7db6a am: 68d5e4b9ff am: 4239033f66
am: bf95981043

Change-Id: I14a7b2c556bbf76b582e23755c1183fa514692ac

commit | commitdiff | tree

Wei Jia [Tue, 14 Jun 2016 17:53:40 +0000 (10:53 -0700)]

MediaPlayer: fix java doc for setSurface and setDisplay.

Bug: 29149415
Change-Id: I281b6328c068255387ca01a987ff136c3be5e25b

commit | commitdiff | tree

Aurimas Liutikas [Tue, 14 Jun 2016 17:56:39 +0000 (17:56 +0000)]

Merge \\\\"Fix broken {@docRoot} links\\\\" into mnc-io-docs am: a0fa50e40b am: 423fe7db6a am: 68d5e4b9ff
am: 96262fb498

Change-Id: Ibaf3476fc67a6dafcf9623dc1dac5d0893445961

commit | commitdiff | tree

Qingxi Li [Tue, 14 Jun 2016 17:49:51 +0000 (17:49 +0000)]

Merge \"Merge \\\"Add a key for setting carrier\\\'s CDMA roaming mode\\\" into nyc-dev am: 130db7715a am: de9fe3597d\" into nyc-mr1-dev-plus-aosp
am: 62060192e9

Change-Id: Idf44c4bb75aba692d371950d80adbba992fc54e2

commit | commitdiff | tree

Aurimas Liutikas [Tue, 14 Jun 2016 17:49:50 +0000 (17:49 +0000)]

Merge \\\\"Fix broken {@docRoot} links\\\\" into mnc-io-docs am: a0fa50e40b am: 423fe7db6a am: 68d5e4b9ff
am: 4239033f66

Change-Id: I22fff40f00da3de9a2081b27238a838334811447

commit | commitdiff | tree

Aurimas Liutikas [Tue, 14 Jun 2016 17:44:17 +0000 (17:44 +0000)]

Merge \\\"Fix broken {@docRoot} links\\\" into mnc-io-docs am: a0fa50e40b am: 423fe7db6a
am: 68d5e4b9ff

Change-Id: I19ac9f6a9006030e2aeba2a1b48c2781d263ad01

commit | commitdiff | tree

Aurimas Liutikas [Tue, 14 Jun 2016 17:44:17 +0000 (17:44 +0000)]

Merge \\\"Fix broken {@docRoot} links\\\" into mnc-io-docs am: a0fa50e40b am: 423fe7db6a
am: 68d5e4b9ff

Change-Id: I81a3ae74f18e97dae21ecdea184126d53095e050

commit | commitdiff | tree

qingxi [Tue, 14 Jun 2016 17:42:58 +0000 (17:42 +0000)]

Merge \\\"Add a key for setting carrier\\\'s CDMA roaming mode\\\" into nyc-dev am: 130db7715a am: bd012f68ac
am: 96c1a81c56

Change-Id: Ia1d1fe3042721888683817004cbb26eba031c011

commit | commitdiff | tree

Aurimas Liutikas [Tue, 14 Jun 2016 17:37:38 +0000 (17:37 +0000)]

Merge \\"Fix broken {@docRoot} links\\" into mnc-io-docs am: a0fa50e40b
am: 423fe7db6a

Change-Id: I192297bc254d199e25249952591b3b2a1fc2b617

commit | commitdiff | tree

Aurimas Liutikas [Tue, 14 Jun 2016 17:32:02 +0000 (17:32 +0000)]

Merge "Clarify Fragment#onHiddenChanged() documentation."

commit | commitdiff | tree

TreeHugger Robot [Tue, 14 Jun 2016 17:31:16 +0000 (17:31 +0000)]

Merge "Fix mapping two shared elements to a single shared element."

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 14 Jun 2016 17:28:25 +0000 (17:28 +0000)]

Merge "Merge \\"Add a key for setting carrier\\'s CDMA roaming mode\\" into nyc-dev am: 130db7715a am: de9fe3597d" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Aurimas Liutikas [Tue, 14 Jun 2016 17:27:57 +0000 (17:27 +0000)]

Merge \"Fix broken {@docRoot} links\" into mnc-io-docs
am: a0fa50e40b

Change-Id: I7dd53f31f44262e09624d23d820723893aaba5c7

commit | commitdiff | tree

Qingxi Li [Tue, 14 Jun 2016 17:27:43 +0000 (17:27 +0000)]

Merge \\"Add a key for setting carrier\\'s CDMA roaming mode\\" into nyc-dev am: 130db7715a
am: de9fe3597d

Change-Id: I9999228882f82fb9d4d36961fe75676b187580a3

commit | commitdiff | tree

Qingxi Li [Tue, 14 Jun 2016 17:27:34 +0000 (17:27 +0000)]

Merge \\"Add a key for setting carrier\\'s CDMA roaming mode\\" into nyc-dev am: 130db7715a
am: bd012f68ac

Change-Id: I8eaac539138c7a6936afa9ef64d43690e0f533f5

commit | commitdiff | tree

Selim Cinek [Tue, 14 Jun 2016 17:27:25 +0000 (17:27 +0000)]

Merge \"Merge \\\"Fixed a bug with a legacy notification API\\\" into nyc-dev am: 05e19bba37 am: 1eb9ae9220\" into nyc-mr1-dev-plus-aosp
am: 6b93bbad08

Change-Id: I26cc1e43f6a45a7070a39bce55d588d10da52961

commit | commitdiff | tree

qingxi [Tue, 14 Jun 2016 17:17:18 +0000 (17:17 +0000)]

Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
am: 130db7715a

Change-Id: I3385fe2660bf9da3f13ef90f4b4b17a8ad0b64ad