OSDN Git Service
Philip P. Moltmann [Tue, 14 Jun 2016 22:24:18 +0000 (22:24 +0000)]
Merge \\"Version PrintRecommendationService.\\" into nyc-dev am:
8e3a16ad91
am:
c6ded5559c
Change-Id: Ide47bb18bb992f8aa499fcb57f0cb33126107d4f
Philip P. Moltmann [Tue, 14 Jun 2016 22:19:45 +0000 (22:19 +0000)]
Merge \"Version PrintRecommendationService.\" into nyc-dev
am:
8e3a16ad91
Change-Id: Ic4d75b1549d314e46db032f3e3506e2cd4776308
Android Build Merger (Role) [Tue, 14 Jun 2016 22:15:56 +0000 (22:15 +0000)]
Merge "Merge \\"Revert \\"Don\\'t update task to return to type for last task over home\\"\\" into nyc-dev am:
5c176ff133 am:
1315d0cb9f" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 14 Jun 2016 22:15:42 +0000 (22:15 +0000)]
Merge "Docs: Added overview of Custom Pointer API am:
37663db137 am:
96344aafc2" into nyc-mr1-dev-plus-aosp
Andrii Kulian [Tue, 14 Jun 2016 22:15:13 +0000 (22:15 +0000)]
Merge \\"Revert \\"Don\\'t update task to return to type for last task over home\\"\\" into nyc-dev am:
5c176ff133
am:
1315d0cb9f
Change-Id: I5c38b2288407f9b34c7f5863d3e3246c925c67a6
Hemal Patel [Tue, 14 Jun 2016 22:15:09 +0000 (22:15 +0000)]
Docs: Added overview of Custom Pointer API am:
37663db137
am:
96344aafc2
Change-Id: Ie9cd2573a1ce95b104fb47da2714a1b69fa8f681
Andrii Kulian [Tue, 14 Jun 2016 22:14:50 +0000 (22:14 +0000)]
Merge \\"Revert \\"Don\\'t update task to return to type for last task over home\\"\\" into nyc-dev am:
5c176ff133
am:
01cc848c6d
Change-Id: I09b4e5e9083362b4cf0aeac1adc934514ce9b31a
Hemal Patel [Tue, 14 Jun 2016 22:14:42 +0000 (22:14 +0000)]
Docs: Added overview of Custom Pointer API am:
37663db137
am:
892d5ccdc5
Change-Id: I924d29ba5561bc2d55df7057e4ca204cd3ea924d
Andrii Kulian [Tue, 14 Jun 2016 22:08:50 +0000 (22:08 +0000)]
Merge \"Revert \"Don\'t update task to return to type for last task over home\"\" into nyc-dev
am:
5c176ff133
Change-Id: I7a901be3116ee6ee8005ee7d6e41c1781ad02718
Hemal Patel [Tue, 14 Jun 2016 22:08:46 +0000 (22:08 +0000)]
Docs: Added overview of Custom Pointer API
am:
37663db137
Change-Id: I8e1824c392fda188fa276a5d2da7ec990a17030b
Andrii Kulian [Tue, 14 Jun 2016 22:08:46 +0000 (22:08 +0000)]
Merge \"Revert \"Don\'t update task to return to type for last task over home\"\" into nyc-dev
am:
5c176ff133
Change-Id: Ibd14c8a53b8d675298d4e13fc064281813881137
Hemal Patel [Tue, 14 Jun 2016 22:08:44 +0000 (22:08 +0000)]
Docs: Added overview of Custom Pointer API
am:
37663db137
Change-Id: I1bf94ef4e1c86dcd14bcf956d35e890ed3a1ad23
TreeHugger Robot [Tue, 14 Jun 2016 22:08:41 +0000 (22:08 +0000)]
Merge "Version PrintRecommendationService." into nyc-dev
Mark Renouf [Tue, 14 Jun 2016 21:57:35 +0000 (21:57 +0000)]
Merge changes I3352e1fc,I52ac4dda,Ie9d51041,Id643a27e into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Set hintTextColor and composingSpan style for EditText and extract view\" into nyc-mr1-dev am:
a884aacb47
Merge \\"Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo\\" into nyc-dev am:
da66010cd8 am:
ab45c9df1f
Merge \\"Fix QS edit view accessibility classes\\" into nyc-dev am:
0809964452 am:
a78fd8a31b
Merge \\"Delete simple reduction implementation.\\" into nyc-dev am:
d749245b88 am:
9a53329b0a
TreeHugger Robot [Tue, 14 Jun 2016 21:55:53 +0000 (21:55 +0000)]
Merge "Revert "Don't update task to return to type for last task over home"" into nyc-dev
Hemal Patel [Mon, 13 Jun 2016 21:37:36 +0000 (14:37 -0700)]
Docs: Added overview of Custom Pointer API
Bug:
28241984
Change-Id: Iffa2a0cc46f71377b79f4ac792d2f469353cc395
Julia Reynolds [Tue, 14 Jun 2016 21:06:08 +0000 (21:06 +0000)]
Only reload callback on configuration change. am:
8d0a400119
am:
2045488afd
Change-Id: Ic420fcfe1b289a66f9f1b9f72ff00f7dd166a3b0
Winson Chung [Tue, 14 Jun 2016 21:06:05 +0000 (21:06 +0000)]
Merge \\"Fixing several issues with accessibility\\" into nyc-dev am:
987cd20acf
am:
55e93a0594
Change-Id: I8de1b1bf792f72c86c74c6e1b10771d5dccb836f
Julia Reynolds [Tue, 14 Jun 2016 21:06:02 +0000 (21:06 +0000)]
Merge \\"Revert \\"Announce access point changes.\\"\\" into nyc-dev am:
a64e3a0844
am:
b269cfe9e1
Change-Id: If9bb3fb9aab16d5d4b4701ea85d8114c36e2b00b
Chris Tate [Tue, 14 Jun 2016 21:05:58 +0000 (21:05 +0000)]
Merge \\"Note null alarm worksource names under the alarm\\'s package\\" into nyc-dev am:
2f4636a333
am:
ab367d1d64
Change-Id: I02c82570521b9f26d1ae99ed54cc8c09a7437d87
Andrew Solovay [Tue, 14 Jun 2016 21:05:55 +0000 (21:05 +0000)]
Merge \\"docs: Updated support library revisions page for 24.0.0\\" into nyc-dev am:
eb4e8105d3
am:
8d853e0cdc
Change-Id: I3bb2d1011831eeedf305704487aecb4c8fdb5aab
Julia Reynolds [Tue, 14 Jun 2016 21:00:34 +0000 (21:00 +0000)]
Only reload callback on configuration change. am:
8d0a400119
am:
f2958d4fa5
Change-Id: I1baa1b6b8e0dcb377362bfaf3e45cba464fc2bd7
Winson Chung [Tue, 14 Jun 2016 21:00:32 +0000 (21:00 +0000)]
Merge \\"Fixing several issues with accessibility\\" into nyc-dev am:
987cd20acf
am:
18bb19206a
Change-Id: I25eef058fb8094834a7f9cdbf74679216b08277a
Julia Reynolds [Tue, 14 Jun 2016 21:00:30 +0000 (21:00 +0000)]
Merge \\"Revert \\"Announce access point changes.\\"\\" into nyc-dev am:
a64e3a0844
am:
66e87fec8c
Change-Id: I6018224b50274a92b060407c5e76045206ad6978
Chris Tate [Tue, 14 Jun 2016 21:00:28 +0000 (21:00 +0000)]
Merge \\"Note null alarm worksource names under the alarm\\'s package\\" into nyc-dev am:
2f4636a333
am:
84df024632
Change-Id: Ibc2a835d8ac63de15634c9ae0403fa483892c840
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
Julia Reynolds [Tue, 14 Jun 2016 20:55:35 +0000 (20:55 +0000)]
Only reload callback on configuration change.
am:
8d0a400119
Change-Id: I4ee29fd4f8d887a9258fa330a9a28e820c21d40e
Winson [Tue, 14 Jun 2016 20:55:33 +0000 (20:55 +0000)]
Merge \"Fixing several issues with accessibility\" into nyc-dev
am:
987cd20acf
Change-Id: I8487203c2b713233915e4a2b5c43a96ac152e7c5
Julia Reynolds [Tue, 14 Jun 2016 20:55:31 +0000 (20:55 +0000)]
Merge \"Revert \"Announce access point changes.\"\" into nyc-dev
am:
a64e3a0844
Change-Id: If07be05e758c9a3e775dd9406637c4be7fdc85ca
Christopher Tate [Tue, 14 Jun 2016 20:55:29 +0000 (20:55 +0000)]
Merge \"Note null alarm worksource names under the alarm\'s package\" into nyc-dev
am:
2f4636a333
Change-Id: I5b4d9ab5ccfbc5473d6d3141f69055b2172ecc73
Andrew Solovay [Tue, 14 Jun 2016 20:55:27 +0000 (20:55 +0000)]
Merge \"docs: Updated support library revisions page for 24.0.0\" into nyc-dev
am:
eb4e8105d3
Change-Id: Iea7e6e5df306243f7cf44066549803aaaf67c866
Julia Reynolds [Tue, 14 Jun 2016 20:54:27 +0000 (20:54 +0000)]
Only reload callback on configuration change.
am:
8d0a400119
Change-Id: I1f3fbfd28483ab27a426ef005fa78553e5185036
Winson [Tue, 14 Jun 2016 20:54:22 +0000 (20:54 +0000)]
Merge \"Fixing several issues with accessibility\" into nyc-dev
am:
987cd20acf
Change-Id: Ifac613535ad66ebdeab76fa76298375b8b6fd658
Julia Reynolds [Tue, 14 Jun 2016 20:54:17 +0000 (20:54 +0000)]
Merge \"Revert \"Announce access point changes.\"\" into nyc-dev
am:
a64e3a0844
Change-Id: I3f534d166a4296411b09e9d54116cdf17f61f818
Christopher Tate [Tue, 14 Jun 2016 20:54:09 +0000 (20:54 +0000)]
Merge \"Note null alarm worksource names under the alarm\'s package\" into nyc-dev
am:
2f4636a333
Change-Id: I326cbd9ed3494797190fc9ee8bfe22a5cdc844c8
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
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
Julia Reynolds [Tue, 14 Jun 2016 19:24:39 +0000 (15:24 -0400)]
Only reload callback on configuration change.
So it'll get zen changes when the volume dialog is not showing.
Change-Id: I0d4220d0a000d74c6994b07b2d5b8562a6a52585
Fixes:
29355577
Winson Chung [Tue, 14 Jun 2016 20:42:21 +0000 (20:42 +0000)]
Merge "Fixing several issues with accessibility" into nyc-dev
Julia Reynolds [Tue, 14 Jun 2016 20:42:14 +0000 (20:42 +0000)]
Merge "Revert "Announce access point changes."" into nyc-dev
Chris Tate [Tue, 14 Jun 2016 20:37:06 +0000 (20:37 +0000)]
Merge "Note null alarm worksource names under the alarm's package" into nyc-dev
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
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
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
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
Philip P. Moltmann [Tue, 14 Jun 2016 20:06:49 +0000 (13:06 -0700)]
Version PrintRecommendationService.
Fixes:
28908572
Change-Id: I8df106df887cacc8db37f781ade97678960cee04
Andrii Kulian [Tue, 14 Jun 2016 19:57:32 +0000 (19:57 +0000)]
Revert "Don't update task to return to type for last task over home"
This reverts commit
21893824c1d15a1a46cb75725ad951620569c3c6.
Original commit revealed issue b/
29342752 when launch logic was applied
to incorrect stack while moving to PiP mode.
Bug:
29342752
Bug:
29237751
Change-Id: I88d75399eb4b9daf4de87a9a560eb0df0b515173
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
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
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
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
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
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
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
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
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
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
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
Adrian Roos [Tue, 14 Jun 2016 19:49:56 +0000 (19:49 +0000)]
Merge "Update AssistDisclosure animation" into nyc-mr1-dev
Dan Yu [Tue, 14 Jun 2016 19:49:11 +0000 (19:49 +0000)]
Merge "docs: Clarifying direct boot notification messages" into mnc-io-docs
Adrian Roos [Tue, 14 Jun 2016 19:42:40 +0000 (19:42 +0000)]
Merge "Improve action bar transition" into nyc-dev
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
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
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
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
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
Adrian Roos [Tue, 14 Jun 2016 19:31:24 +0000 (19:31 +0000)]
Merge "Fix jittery action bar during transitions" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:31:12 +0000 (19:31 +0000)]
Merge "Make RemoteView margins density-change safe" into nyc-dev
Michael Kwan [Tue, 14 Jun 2016 19:26:57 +0000 (19:26 +0000)]
Merge "Added customizable default system theme." into nyc-mr1-dev
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
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
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
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
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
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
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
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
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
Shreyas Basarge [Tue, 14 Jun 2016 18:54:43 +0000 (18:54 +0000)]
Merge "Update SyncManager min period to match JobScheduler" into nyc-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Tue, 14 Jun 2016 18:20:48 +0000 (18:20 +0000)]
Merge "docs: Updating N download pages for DP4" into nyc-dev
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
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
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
Hemal Patel [Tue, 14 Jun 2016 18:11:09 +0000 (18:11 +0000)]
Merge "Docs: Changed a command in Keyboard Shortcuts" into nyc-dev
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
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
OSDN Git Service
