OSDN Git Service
David Friedman [Wed, 15 Jun 2016 01:12:19 +0000 (01:12 +0000)]
Merge \"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\" into nyc-dev
am:
ea1f3cb5c3
Change-Id: Ib6e5fd941a3b091274fc5af2428f4a567abb5b69
Robert Carr [Wed, 15 Jun 2016 01:12:17 +0000 (01:12 +0000)]
Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev
am:
3e5df9fb50
Change-Id: I59d035329b3e6acbc929564ba7ce1107943c6587
Shawn Willden [Wed, 15 Jun 2016 01:04:48 +0000 (01:04 +0000)]
Merge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev
am:
2c2f8acdab
Change-Id: Id639d2ce9ac95fc1a0a87048e5b3f8b8137c5fdd
David Friedman [Wed, 15 Jun 2016 00:59:52 +0000 (00:59 +0000)]
Merge "Docs: Adds SurfaceView to API Overview page for Android-N DP4." into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 00:59:19 +0000 (00:59 +0000)]
Merge "Toast timeout: Just strip FLAG_KEEP_SCREEN_ON" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 00:56:45 +0000 (00:56 +0000)]
Merge "Unbreak Javadoc on getAttestationChallenge()" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 00:56:29 +0000 (00:56 +0000)]
Merge "Prevent NPE when updating models without a vendor UUID" into nyc-mr1-dev
David Friedman [Tue, 14 Jun 2016 22:37:16 +0000 (15:37 -0700)]
Docs: Adds SurfaceView to API Overview page for Android-N DP4.
Change-Id: I29854c82ef788b00c1ebc305bc5faf463c2d8dc8
Dirk Dougherty [Wed, 15 Jun 2016 00:28:07 +0000 (00:28 +0000)]
Merge \"Add API 24 to reference selector.\" into nyc-dev
am:
398d088871
Change-Id: I922cb82b69a13913d83280d1003e292528bdfd88
Dirk Dougherty [Wed, 15 Jun 2016 00:20:26 +0000 (00:20 +0000)]
Merge "Add API 24 to reference selector." into nyc-dev
Todd Kennedy [Tue, 14 Jun 2016 23:57:17 +0000 (23:57 +0000)]
Merge "New API w/ multiple prefixes" into nyc-mr1-dev
Dirk Dougherty [Tue, 14 Jun 2016 23:51:55 +0000 (23:51 +0000)]
Merge \"Doc change: add diffs for 23->24.\" into nyc-dev
am:
70e358b017
Change-Id: I51b151fce31f891d6ab61f48d094ea56fa0da817
Dirk Dougherty [Tue, 14 Jun 2016 23:44:23 +0000 (23:44 +0000)]
Merge "Doc change: add diffs for 23->24." into nyc-dev
Dirk Dougherty [Tue, 14 Jun 2016 23:26:28 +0000 (16:26 -0700)]
Add API 24 to reference selector.
Change-Id: I153245ef814e27bf50f9d972ad1aa34fd92e6b8a
Wale Ogunwale [Tue, 14 Jun 2016 23:12:14 +0000 (23:12 +0000)]
Merge \"Make sure task exists in WM before trying to set the resizing state\" into nyc-dev
am:
39647560d1
Change-Id: Id9f331026d9bc76a0764685c03b0366e821cebc5
Selim Cinek [Tue, 14 Jun 2016 23:12:12 +0000 (23:12 +0000)]
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
am:
02ab2f52bf
Change-Id: I3ca5e31a3571398d1eb00cf0c7f40d1bb007055f
TreeHugger Robot [Tue, 14 Jun 2016 23:05:49 +0000 (23:05 +0000)]
Merge "Make sure task exists in WM before trying to set the resizing state" into nyc-dev
Selim Cinek [Tue, 14 Jun 2016 23:04:30 +0000 (23:04 +0000)]
Merge "Fixed another case where the systemUI could crashloop" into nyc-dev
Andrew Solovay [Tue, 14 Jun 2016 23:01:33 +0000 (23:01 +0000)]
Merge \"docs: Noted \"Crypto\" removal\" into nyc-dev
am:
8d7b4a4945
Change-Id: I9bc56a5c233f7c6ab02f65098ad7c9a40729cb72
Todd Kennedy [Fri, 10 Jun 2016 23:42:00 +0000 (16:42 -0700)]
New API w/ multiple prefixes
Use the new API that contains multiple hash prefixes and a mask. Also
do some small refactoring necessary to handle multiple prefixes and
use a common implementation of the hash generation
Change-Id: Ib52f767ea6aadc30c67c5bdee949e9f9c5f04e44
Shawn Willden [Tue, 14 Jun 2016 22:59:14 +0000 (16:59 -0600)]
Unbreak Javadoc on getAttestationChallenge()
Bug:
28844154
Change-Id: I8402a39f366291cd2b5d646536cd2c2bab8556d2
TreeHugger Robot [Tue, 14 Jun 2016 22:54:46 +0000 (22:54 +0000)]
Merge "docs: Noted "Crypto" removal" into nyc-dev
Chris Thornton [Tue, 14 Jun 2016 22:53:14 +0000 (15:53 -0700)]
Prevent NPE when updating models without a vendor UUID
Change-Id: If58cd3ddb0a2afd601af3e3868ab4ff500be53a9
Yohei Yukawa [Tue, 14 Jun 2016 22:48:35 +0000 (22:48 +0000)]
Merge \"Quick workaround for a performance regression in IME APIs.\" into nyc-dev
am:
6fe4865e85
Change-Id: I96bef7f47729282a57b6acc11c8bf4ada42c6a06
Robert Carr [Sat, 11 Jun 2016 01:44:24 +0000 (18:44 -0700)]
Toast timeout: Just strip FLAG_KEEP_SCREEN_ON
We added the toast timeout to fix b/
21693547. Where the client
leaks non visible toasts which end up keeping the screen on.
Simply removing the toast windows as we were doing previously,
isn't very good though. If the timeout fires when an app could
still use the toast (e.g. due to long pause under debugger),
the app could crash. It's not obvious how (if even possible
without API semantic/guarantee change) to prevent this issue
from the client side. Furthermore, #33 at b/
21693457 implies that
we need to respect FLAG_KEEP_SCREEN_ON even for windows that
never submitted a buffer. With time constraints as they are,
the only solution I can think of that solves both without
chance of regression is just stripping FLAG_KEEP_SCREEN_ON when the
timeout fires.
Bug:
29105388
Change-Id: Ic2df897f86acf814ea3d4f911a0532d65af0c19f
Yohei Yukawa [Tue, 14 Jun 2016 22:43:18 +0000 (22:43 +0000)]
Merge "Quick workaround for a performance regression in IME APIs." into nyc-dev
Doris Ling [Tue, 14 Jun 2016 22:35:18 +0000 (22:35 +0000)]
Merge "Added config system navigation keys." into nyc-mr1-dev
Philip P. Moltmann [Tue, 14 Jun 2016 22:20:30 +0000 (22:20 +0000)]
Merge \"Version PrintRecommendationService.\" into nyc-dev
am:
8e3a16ad91
Change-Id: Ifd37bc80af0fe759a5e6673245ace2eebd82e513
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
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
Wale Ogunwale [Tue, 14 Jun 2016 20:10:09 +0000 (13:10 -0700)]
Make sure task exists in WM before trying to set the resizing state
It is possible for a task to be removed from the WM and stack in AM
while resizing (e.g. app crashes). In this case we want to make sure
the task exist in WM before we try to set the dock resizing state vs.
depending on the fact that the task is in recent list in AM.
Bug:
29325623
Change-Id: Ib89a7bfe12fe1f2c4c6c56ac9e13b0052ea2b4ec
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
Yohei Yukawa [Tue, 14 Jun 2016 05:16:52 +0000 (22:16 -0700)]
Quick workaround for a performance regression in IME APIs.
It turns out that the performance of
InputMethodManager#getCurrentInputMethodSubtype() is regressed from ~1ms
to ~20ms when
- Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE == -1 and
- The active IME supports many subtypes (~100)
because we try to find a fallback subtype based on the system locales
every time when IMM#getCurrentInputMethodSubtype() is called.
This could be contributing UI janks because spell checker clients
running in the UI thread indirectly depend on that method.
Fortunatelly the critical path is in
InputMethodUtils#getImplicitlyApplicableSubtypesLockedImpl(), which is
basically a state-less method. We can easily and safely cache its
result by using LocaleList and InputMethod as cache keys.
With this CL the performance basically recovers to the Android M level.
Bug:
28889203
Change-Id: I5ed16c7f14cc18052854f4fd6c9bae8550c332ee
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
Andrew Solovay [Fri, 10 Jun 2016 23:34:27 +0000 (16:34 -0700)]
docs: Noted "Crypto" removal
See first comment for doc stage location.
bug:
28972616
Change-Id: I891af3d2e0b84f2daa207221e477a09efafc9d18
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
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
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
Selim Cinek [Tue, 14 Jun 2016 17:57:25 +0000 (10:57 -0700)]
Fixed another case where the systemUI could crashloop
Because it's not guaranteed to use any builder at all,
there is another case where the SmallIcon could remain null.
We are now checking this lazily instead of ahead of time.
Change-Id: I7a0feff6911b2bce6707427259d3423131a26e32
Fixes:
29255365
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
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: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: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
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 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: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
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
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
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
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: 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:44:17 +0000 (17:44 +0000)]
Merge \\\"Fix broken {@docRoot} links\\\" into mnc-io-docs am:
a0fa50e40b am:
423fe7db6a
am:
68d5e4b9ff
Change-Id: I81a3ae74f18e97dae21ecdea184126d53095e050
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
Julia Reynolds [Tue, 14 Jun 2016 17:28:47 +0000 (17:28 +0000)]
Revert "Announce access point changes."
Fixes:
29151018
This reverts commit
7ed62eb7a214126d3dbfd6abd7d6a7db73cc9f3c.
Change-Id: If40669b21cc2a2db7e2bb27c7c981d889cb094ed
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
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
Christopher Tate [Tue, 14 Jun 2016 17:16:28 +0000 (10:16 -0700)]
Note null alarm worksource names under the alarm's package
And log a nastygram because it implies the app is misbehaving.
Bug
29333122
Change-Id: Ia683304b8a9eafb234df81e874ee3f0636c4e56a
Aurimas Liutikas [Tue, 14 Jun 2016 17:14:57 +0000 (17:14 +0000)]
Merge "Fix broken {@docRoot} links" into mnc-io-docs
Qingxi Li [Tue, 14 Jun 2016 17:02:51 +0000 (17:02 +0000)]
Merge "Add a key for setting carrier's CDMA roaming mode" into nyc-dev
Selim Cinek [Tue, 14 Jun 2016 17:02:40 +0000 (17:02 +0000)]
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
am:
05e19bba37
Change-Id: If9bd17e99ba4665f49f873bf01e0d1db01d49f54
Selim Cinek [Tue, 14 Jun 2016 16:54:20 +0000 (16:54 +0000)]
Merge "Fixed a bug with a legacy notification API" into nyc-dev
Makoto Onuki [Mon, 13 Jun 2016 21:50:11 +0000 (14:50 -0700)]
Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent
This method is called by AM with the lock held, so can't take the
DPMS lock.
It still takes a different lock, but we don't call into the external
world while holding this lock, so this is fine.
Bug
29242568
Change-Id: Idbecdd7d97385ca66c693903443471fdbae833e6
Daniel Yu [Mon, 6 Jun 2016 18:27:07 +0000 (11:27 -0700)]
docs: Clarifying direct boot notification messages
Adding details on which notification message to listen for
when developing apps that need to interact with direct boot mode.
Note: This is a doc fix for the N direct boot feature docs, but
not specific to any preview release.
Bug:
28729775
Change-Id: If6b239e7aa92bced735cfa1e72d8891d193a420c
Bert McMeen [Tue, 14 Jun 2016 15:21:59 +0000 (15:21 +0000)]
Merge \\\"Docs: Watch face performance update\\\" into mnc-io-docs am:
99677fb42d am:
106af82850
am:
22eb26c27d
Change-Id: If7a2cf955301438736cb3097aadc7b0b08308a07
Bert McMeen [Tue, 14 Jun 2016 15:15:59 +0000 (15:15 +0000)]
Merge \\"Docs: Watch face performance update\\" into mnc-io-docs am:
99677fb42d
am:
106af82850
Change-Id: Ia9fa224a4ebb6e51a3c6141751036504d202e137
Bert McMeen [Tue, 14 Jun 2016 15:07:53 +0000 (15:07 +0000)]
Merge \"Docs: Watch face performance update\" into mnc-io-docs
am:
99677fb42d
Change-Id: I41b6ee0628e561cfb7f711d07ac1e41ff71fcb60
Bert McMeen [Tue, 14 Jun 2016 15:01:59 +0000 (15:01 +0000)]
Merge "Docs: Watch face performance update" into mnc-io-docs
Shreyas Basarge [Tue, 14 Jun 2016 14:32:02 +0000 (15:32 +0100)]
Update SyncManager min period to match JobScheduler
Use JobScheduler's minimum period in SyncManager.
Syncs will respect JobScheduler's min period anyway,
this change ensures that dumpsys of both services
show the same period.
Bug:
29253834
Change-Id: I0cd7f85da56af967963573a048c3a71436ed9c5b
John Reck [Tue, 14 Jun 2016 14:54:18 +0000 (14:54 +0000)]
Merge \"Redraw if dirty during stopped when resumed\" into nyc-dev
am:
5b4ff21a74
Change-Id: If4eedb4a4c1ff6d4e96f8b0db4ddd846a2967a9f
John Reck [Tue, 14 Jun 2016 14:43:19 +0000 (14:43 +0000)]
Merge "Redraw if dirty during stopped when resumed" into nyc-dev
Bill Yi [Tue, 14 Jun 2016 12:21:19 +0000 (12:21 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
7ce75172dd -s ours
Change-Id: I274fab0d3c27f19b7cf98e30f0c068a12df716a7
Bill Yi [Tue, 14 Jun 2016 12:06:33 +0000 (12:06 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
bb8b32262f -s ours
Change-Id: Ie868e30032e9dc633bd2205413704d30801fd815
TreeHugger Robot [Tue, 14 Jun 2016 11:47:53 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:46:58 +0000 (11:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:46:42 +0000 (11:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:46:23 +0000 (11:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Paul Jensen [Tue, 14 Jun 2016 11:16:12 +0000 (11:16 +0000)]
Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev
am:
78452db285
Change-Id: I4522f765c6166bd1c8216088b1605eac4c69d869
Paul Jensen [Tue, 14 Jun 2016 11:05:31 +0000 (11:05 +0000)]
Merge "Show sign-in to network notification to all users, not just owner." into nyc-dev