OSDN Git Service
Amit Mahajan [Wed, 12 Apr 2017 22:02:34 +0000 (22:02 +0000)]
Merge "Add p2 option in openLogicalChannel." into oc-dev
Dianne Hackborn [Wed, 12 Apr 2017 21:37:47 +0000 (21:37 +0000)]
Merge "Allow appops command to modify uid ops." into oc-dev
Svet Ganov [Wed, 12 Apr 2017 21:21:56 +0000 (21:21 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16
am:
91ed4d7553 -s ours
Change-Id: Ia744f56107b83b6a5d5e236d24641bd7db71ab02
Julius D'souza [Wed, 12 Apr 2017 21:20:47 +0000 (21:20 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886
am:
f72dd4142b -s ours
Change-Id: Ia99beb815b720219daecfdc9446c5ff2c4d1b16f
TreeHugger Robot [Wed, 12 Apr 2017 21:17:29 +0000 (21:17 +0000)]
Merge "Add autofill feature API" into oc-dev
Svet Ganov [Wed, 12 Apr 2017 21:11:57 +0000 (21:11 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
am:
39c3d2cf16
Change-Id: I3ddf7e0ceadd7c179f3c7de198658af190985f1b
Dianne Hackborn [Wed, 12 Apr 2017 21:11:40 +0000 (21:11 +0000)]
Merge "Add API to get a uid's current importance." into oc-dev
Julius D'souza [Wed, 12 Apr 2017 21:10:49 +0000 (21:10 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
am:
0a8ecc6886
Change-Id: I262e7497e9256f708847ba7c767f202c91aa1739
Makoto Onuki [Wed, 12 Apr 2017 21:10:32 +0000 (21:10 +0000)]
Merge ""bmgr restore" really should wait until operation finishes." into oc-dev
Dianne Hackborn [Wed, 12 Apr 2017 21:09:59 +0000 (21:09 +0000)]
Merge "Fix issue #
37220301: Allow broadcasts with permissions to not be restricted" into oc-dev
Selim Gurun [Wed, 12 Apr 2017 21:05:03 +0000 (21:05 +0000)]
Merge "Deprecate findAddress() method" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 21:00:21 +0000 (21:00 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
TreeHugger Robot [Wed, 12 Apr 2017 20:43:13 +0000 (20:43 +0000)]
Merge "Make QS light" into oc-dev
Bill Yi [Wed, 12 Apr 2017 20:19:34 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:45:50 +0000 (19:45 +0000)]
Merge "Allow instant app resolution for any user" into oc-dev
Seigo Nonaka [Wed, 12 Apr 2017 19:39:41 +0000 (19:39 +0000)]
Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:39:12 +0000 (19:39 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:37:22 +0000 (19:37 +0000)]
Merge "Add documentation for 'am start-foreground-service'" into oc-dev
Julia Reynolds [Wed, 12 Apr 2017 19:13:01 +0000 (19:13 +0000)]
Merge "Clear calling identity before verifying listeners" into oc-dev
Julius D'souza [Wed, 12 Apr 2017 06:41:27 +0000 (23:41 -0700)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
Bug:
36515029
Test: the build still works.
Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84
(cherry picked from commit
8e9ea907448c49f573dd045707e37dd14efdf152)
Casey Burkhardt [Wed, 12 Apr 2017 19:04:12 +0000 (19:04 +0000)]
Merge "Improved multiuser support for A11y button/Magnification" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 18:54:28 +0000 (18:54 +0000)]
Merge "Fill UI polish" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 18:33:18 +0000 (18:33 +0000)]
Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev
Mady Mellor [Wed, 12 Apr 2017 18:27:23 +0000 (18:27 +0000)]
Merge "Don't offer snooze for foreground service notifications" into oc-dev
Charles He [Wed, 12 Apr 2017 18:25:46 +0000 (18:25 +0000)]
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 18:17:48 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Siyamed Sinir [Wed, 12 Apr 2017 18:09:50 +0000 (18:09 +0000)]
Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev
Makoto Onuki [Wed, 12 Apr 2017 17:10:22 +0000 (10:10 -0700)]
"bmgr restore" really should wait until operation finishes.
Test: manual test
Bug
37246838
Change-Id: Ice381dc250e2d2a59cff48152dd3c8d6897d0804
Dianne Hackborn [Wed, 12 Apr 2017 17:55:49 +0000 (17:55 +0000)]
Merge "Add new "work queue" feature to JobScheduler." into oc-dev
Dianne Hackborn [Wed, 12 Apr 2017 17:54:03 +0000 (10:54 -0700)]
Add API to get a uid's current importance.
This is kind-of useful to go along with monitoring
uid importance changes.
Test: none yet
Change-Id: Ic0f8418955d17ea21d06f49dcd9641bc5f32387b
TreeHugger Robot [Wed, 12 Apr 2017 17:52:56 +0000 (17:52 +0000)]
Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 17:37:01 +0000 (17:37 +0000)]
Merge "Change behavior of setBitmap to cleanly reset the canvas" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 17:31:38 +0000 (17:31 +0000)]
Merge "Remove unused public APIs." into oc-dev
Soonil Nagarkar [Wed, 12 Apr 2017 17:27:40 +0000 (17:27 +0000)]
Merge "Fix foreground importance bug in LocationManagerService." into oc-dev
Dongwon Kang [Wed, 12 Apr 2017 17:12:13 +0000 (17:12 +0000)]
Merge "TIF: add review rating columns to programs" into oc-dev
Jorim Jaggi [Wed, 12 Apr 2017 17:06:10 +0000 (17:06 +0000)]
Merge "Disallow task snapshot starting window for intent != ACTION_MAIN" into oc-dev
Jorim Jaggi [Wed, 12 Apr 2017 17:04:07 +0000 (17:04 +0000)]
Merge "Fix NPE in TaskSnapshotController" into oc-dev
Jason Monk [Wed, 12 Apr 2017 17:00:34 +0000 (17:00 +0000)]
Merge "Updates for QS DND tile" into oc-dev
Jason Monk [Wed, 12 Apr 2017 16:59:56 +0000 (16:59 +0000)]
Merge "Visual changes to dual target tiles" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 16:59:28 +0000 (16:59 +0000)]
Merge "Ensure bounds are updated together." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 16:54:43 +0000 (16:54 +0000)]
Merge "Introduce FILE_ID for TTC fonts and variation fonts." into oc-dev
Svet Ganov [Wed, 12 Apr 2017 16:25:20 +0000 (09:25 -0700)]
Add autofill feature API
We now have a software feature for autofill which can be used
by partners to disable it on low-end devices or form factors
for which autofill doesn't make sense.
bug:
35956220
Test: manual (requires a custom build)
Change-Id: I6c06462ed9ca3ae93331700dce38a8c08dfd0722
Svet Ganov [Wed, 12 Apr 2017 06:10:43 +0000 (23:10 -0700)]
Fill UI polish
1. Avoid jank when the suggesting list scrolled
2. Remove hard-coded values from max popup height
3. UX requested tweaks
4. Remove dead code
Test: manual
bug:
37245055
bug:
37179467
Change-Id: I6a6760edb06230e3d4925e23863667cfd3ac0601
Daniel Nishi [Wed, 12 Apr 2017 16:37:47 +0000 (16:37 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
Charles He [Wed, 12 Apr 2017 15:22:35 +0000 (16:22 +0100)]
Disallow direct-boot aware activities to bypass work lock
Effectively reverting
89927b3cd96472c478a988d6c731cd09d412a043, which
allowed direct-boot aware activities in the work profile to show before
the profile was unlocked. This causes problems with key eviction
introduced in O. Specifically, many system activities (e.g.
ChooserActivity, activities in Settings, etc.) are marked direct-boot
aware, and therefore can be started while the work profile is locked
with key evicted. Currently they either bypass the keyguard when they
should not, or simply crash due to profile still being locked.
In the future, we need to create a new mechanism to allow activities
such as video calls, alarm clocks, etc. to bypass the work keyguard. It
probably involves checking for something like FLAG_SHOW_WHEN_LOCKED.
Bug:
36961785
Bug:
35708183
Bug:
30296144
Test: manual, by following the steps in the bugs quoted
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I5ccaaf963f3dd96e4abb785a10aa258b15363178
Dmitri Plotnikov [Wed, 12 Apr 2017 16:34:27 +0000 (16:34 +0000)]
Merge "Fixing content intent on External Storage notification" into oc-dev
Svet Ganov [Mon, 5 Dec 2016 17:03:24 +0000 (09:03 -0800)]
[DO NOT MERGE] Allow multiple toasts for the focused app
We don't allow apps to add multiple toast windows to
prevent an attacker to keep adding the same toast as
a workaround for our measure to ensure toast windows
are removed after a timeout. The may cause backwards
compatibility issue for apps that add multiple toasts.
While we need to fix the security vulnerability it is
desirable to make the fix as backwards compatible as
possible. This change allows the focused app to add
as many toast windows as it wants since they will be
removed after the timeout and once the app is not the
one the user uses it will lose the multiple toast add
capability.
bug:
30150688
Change-Id: I2d9295926cb49b5bb80c7af2546872ff8ca22c64
(cherry picked from commit
296a60acc3d67cea23bae167dbcb51c0d0d60b23)
Julia Reynolds [Wed, 12 Apr 2017 13:41:16 +0000 (09:41 -0400)]
Clear calling identity before verifying listeners
Also don't throw when can't verify listener.
And update mocking in tests to clean state between tests.
Bug:
36783632
Fixes:
37263567
Test: runtest-systemui-notification, create a secondary user
Change-Id: I5ec95539c9859b67b8fbc7e6a85334e08e6b5a98
TreeHugger Robot [Wed, 12 Apr 2017 16:07:22 +0000 (16:07 +0000)]
Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev
Kang Li [Sat, 25 Feb 2017 01:41:07 +0000 (17:41 -0800)]
Updates reportChooserSelection to be synchronized with queryUsageStats
in UsageStatsService, to fix a flaky test.
Bug:
35763877
Test: manually ran the flaky tests for 50 times, to verify that it is
stable.
Change-Id: I56d355bb283275f33bf7a24d0cc5b6454b99a35e
(cherry picked from commit
434f76a8d739060b5c8e96b4824687c19b94ee79)
Jean-Michel Trivi [Wed, 12 Apr 2017 15:45:49 +0000 (15:45 +0000)]
Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev
Mady Mellor [Wed, 12 Apr 2017 15:32:26 +0000 (15:32 +0000)]
Merge "Show x for short period of time when activity is PIP'd" into oc-dev
Paul Mclean [Wed, 12 Apr 2017 15:16:17 +0000 (15:16 +0000)]
Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev
Mark Salyzyn [Wed, 12 Apr 2017 14:49:12 +0000 (14:49 +0000)]
Merge "jni: isLoggable: adapt to removal of property name size limit" into oc-dev
Seigo Nonaka [Mon, 10 Apr 2017 18:03:24 +0000 (11:03 -0700)]
Introduce FILE_ID for TTC fonts and variation fonts.
A single TTC font or variation font can be used for multiple entry
of FontResult. To share the file contents, assign same URI for those.
Bug:
36494487
Test: android.provider.FontsContractTest passes
Change-Id: Ibf24f216179a6481dee1801cd2dfb68c4bb38fac
TreeHugger Robot [Wed, 12 Apr 2017 14:16:04 +0000 (14:16 +0000)]
Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev
Seigo Nonaka [Tue, 11 Apr 2017 17:40:55 +0000 (10:40 -0700)]
Update Typeface.Builder API to reflect API feedback.
- Stop pooling and remove reset method.
- Introduce overloaded constructors instead of setSource methods.
- Make italic parameter boolean and treat "not called" as
RESOLVE_BY_FONT_TABLE.
- Remove constants and move them to Typeface with private static
constant.
- Fix JavaDoc.
Bug:
37082657
Test: android.graphics.cts.TypefaceTest passed
Change-Id: I0c50cf3e2d50c0021f7e12bbb7ed7ae89fa1c2a1
Jesse Evans [Fri, 7 Apr 2017 23:11:26 +0000 (16:11 -0700)]
Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED
Renames the instant apps setting to reflect what it is for.
Adds the SystemApi annotation to make this field visible
to the resolver and installer.
Test: existing tests
Change-Id: I1651bb101d69bdfdaa63c004435025c68a33cd8e
Pavel Grafov [Wed, 12 Apr 2017 12:33:48 +0000 (12:33 +0000)]
Merge "Improve javadocs for SecurityLog class." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 10:59:53 +0000 (10:59 +0000)]
Merge "Add helptext to bu command." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 09:43:06 +0000 (09:43 +0000)]
Merge "Do not inset autofill highlight" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 09:35:12 +0000 (09:35 +0000)]
Merge "Implement enumerate in FingerprintService" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 09:12:19 +0000 (09:12 +0000)]
Merge "Make "Paste as plain text" resource string public." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 09:02:10 +0000 (09:02 +0000)]
Merge "Change AOSP launcher icon mask Test: manual b/
36854903" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 05:10:59 +0000 (05:10 +0000)]
Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev
Suprabh Shukla [Wed, 12 Apr 2017 04:32:45 +0000 (04:32 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
Jean-Michel Trivi [Wed, 12 Apr 2017 01:52:43 +0000 (18:52 -0700)]
VolumeShaper: update API, use "Millis" instead of "Ms"
Test: make
Bug:
36785428
Change-Id: Ib77ff448bb8454453b1bd39f1491b0189b4ff15b
Julius D'souza [Wed, 12 Apr 2017 02:01:49 +0000 (02:01 +0000)]
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am:
9e3c9eeb96
am:
3c6d6f53f3 -s ours
Change-Id: Ic4af1cac3a0929db20eccd0693ec5fad834b0093
Julius D'souza [Wed, 12 Apr 2017 01:55:57 +0000 (01:55 +0000)]
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
am:
9e3c9eeb96
Change-Id: Ic97ec1a7e4c5b76bcab8350102585e4dd2cd199b
Julius D'souza [Wed, 12 Apr 2017 01:41:38 +0000 (01:41 +0000)]
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
TreeHugger Robot [Wed, 12 Apr 2017 01:40:55 +0000 (01:40 +0000)]
Merge "Changing importance should record user locked field." into oc-dev
Andreas Gampe [Wed, 12 Apr 2017 01:36:31 +0000 (01:36 +0000)]
Merge "OtaDexOptService: Log post-reboot moves" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 01:22:49 +0000 (01:22 +0000)]
Merge "Allow companion device mgrs channel access" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 01:07:28 +0000 (01:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Ajay Nambi [Fri, 4 Dec 2015 22:37:49 +0000 (14:37 -0800)]
Add p2 option in openLogicalChannel.
- Add support for iccOpenLogicalChannelWithP2.
- Needed to support OMAPI 3.0 defined
by SIM Alliance.
- Deprecate iccOpenLogicalChannel(String) API and
pass down an invalid p2 value to keep original behavior
Test: Basic telephony sanity
Bug:
27360148
Change-Id: I2ab6cfb7a54c451f32936df51b8298f35a6dc67f
Dianne Hackborn [Wed, 12 Apr 2017 00:38:42 +0000 (17:38 -0700)]
Fix issue #
37220301: Allow broadcasts with permissions to not be restricted
Allowed!
Test: new CTS tests added.
Change-Id: I16f49746c0d6f5368625b54df6ffb510aa4cb5ab
Abodunrinwa Toki [Tue, 11 Apr 2017 02:47:41 +0000 (03:47 +0100)]
Make "Paste as plain text" resource string public.
Test: no test
Bug:
37164197
Change-Id: Ia15bd434e1d4ccdf9f1711db3a323c89bc2f96ff
Conrad Chen [Wed, 12 Apr 2017 00:25:33 +0000 (00:25 +0000)]
Merge "TIF: add TvInputManager methods to notify apps" into oc-dev
Jorim Jaggi [Tue, 11 Apr 2017 23:29:10 +0000 (16:29 -0700)]
Disallow task snapshot starting window for intent != ACTION_MAIN
We don't want to show a task snapshot if the intent wasn't the
launcher intent. Likely the app will show something different, so
we shouldn't show a snapshot in this case.
Test: AppWindowContainerControllerTests
Test: Open app, make sure we get snapshot window
Test: Open Chrome, go home, Open chrome incognito from shortcut,
make sure no flash
Change-Id: Ib608ba8070ce09f418f1036248d81eebfa354128
Fixes:
35099602
David Stevens [Wed, 12 Apr 2017 00:12:11 +0000 (00:12 +0000)]
Merge "Reset the default usb package less often" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 00:07:29 +0000 (00:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Colin Cross [Wed, 12 Apr 2017 00:06:02 +0000 (00:06 +0000)]
Merge "Add missing transitive dependencies" into oc-dev
Colin Cross [Wed, 12 Apr 2017 00:04:55 +0000 (00:04 +0000)]
Merge "Update layoutlib to match java library changes" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 00:02:32 +0000 (00:02 +0000)]
Merge "Keep spans while transforming to uppercase" into oc-dev
Evan Rosky [Wed, 12 Apr 2017 00:02:21 +0000 (00:02 +0000)]
Merge "Make AdapterView auto-focusable-aware" into oc-dev
Daniel Nishi [Mon, 10 Apr 2017 18:21:26 +0000 (11:21 -0700)]
Use the StorageStatsManager in FileCollector.
This should vastly improve the speed of the FileCollector.
Change-Id: I7a878a0622bbd6c758fb1d36125414d8b025e709
Fixes:
35807386
Test: Existing tests continue to pass.
Russell Brenner [Fri, 24 Feb 2017 19:11:47 +0000 (11:11 -0800)]
Add hidden SystemApi for two setup wizard actions
ACTION_UPGRADE_SETUP exists as an SdkConstant and is now additionally
tagged as a SystemApi. ACTION_DEVICE_INITIALIZATION_WIZARD is added
as a deprecated SystemApi to appease CTS requirements. Both APIs are
hidden.
Test: cts-tradefed run cts-dev -m CtsSignatureTestCases \
-t android.signature.cts.IntentTest#shouldNotFindUnexpectedIntents
Bug:
33663899
Change-Id: Ib45afbfcbb9a3d3020f11c8b63fc2bcf6fc447a1
(cherry picked from commit
4cd32e5395a9e97e281823c8c57e1c18845447c4)
TreeHugger Robot [Tue, 11 Apr 2017 23:53:14 +0000 (23:53 +0000)]
Merge "Improve caching behavior of thumbnails" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:51:48 +0000 (23:51 +0000)]
Merge "Clean up activity a bit and disable it by default" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:50:07 +0000 (23:50 +0000)]
Merge "Ensure visible activities when device is unlocked." into oc-dev
Kevin Chyn [Mon, 3 Apr 2017 20:37:48 +0000 (13:37 -0700)]
Implement enumerate in FingerprintService
Enumeration will happen only for the current active user.
Fixes
35358801
Test: manual
Change-Id: I4c935626edba6eceb1aec4f79a7b3a39313943a5
TreeHugger Robot [Tue, 11 Apr 2017 23:15:32 +0000 (23:15 +0000)]
Merge "Grant Shell ability to clear cached app data." into oc-dev
Mark Salyzyn [Fri, 7 Apr 2017 18:26:26 +0000 (11:26 -0700)]
jni: isLoggable: adapt to removal of property name size limit
(cherry picked from commit
8143fa57adfbb4a5cc253e4ef68663525a8f81eb)
There is no longer a name size limit to the properties, remove
illegalArgumentException if tag length is too large.
Test: build
Bug:
36696208
Change-Id: I4b4329c8c951082ed0d777cdd70ee3e773bed16c
Brad Ebinger [Tue, 11 Apr 2017 23:12:07 +0000 (23:12 +0000)]
Merge "Move @SystemApi access to ImsService" into oc-dev
Powei Feng [Tue, 11 Apr 2017 23:00:45 +0000 (23:00 +0000)]
Revert "Transition from Activity to Broadcast for TV Search"
This reverts commit
1331d26142b9b3271292e3f58e7e79e1cb78d619.
Reason for revert: b/
36725187
Bug:
36725187
Test: manual testing of search on Fugu
Change-Id: I02e7abeee264ceada88f220f2eddb9f92ef397bc
TreeHugger Robot [Tue, 11 Apr 2017 22:59:59 +0000 (22:59 +0000)]
Merge "Toast whenever a notification fails to post" into oc-dev
Jorim Jaggi [Tue, 11 Apr 2017 22:55:57 +0000 (15:55 -0700)]
Fix doc for FLAG_DISMISS_KEYGUARD
Test: n/a
Change-Id: I7e8b0e22895e5efe839dc0f73bcfda6a67f52026
Fix:
36023803
Jorim Jaggi [Tue, 11 Apr 2017 22:50:19 +0000 (15:50 -0700)]
Fix NPE in TaskSnapshotController
Test: Pray
Change-Id: Ie65f072b35fbf1a9a65caf5be48dabbb7abb6be8
Fixes:
36592724
TreeHugger Robot [Tue, 11 Apr 2017 22:35:45 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 22:28:39 +0000 (22:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev