OSDN Git Service
Hyunyoung Song [Fri, 5 May 2017 21:09:23 +0000 (21:09 +0000)]
Merge "Fix issue in InsetDrawable where master inset attribute get ignored. Test: builds, and did manual test b/
37752336" into oc-dev
am:
52eba0ad70
Change-Id: I0bf917bccbd2747ea18049577f5d79fe457eea4f
Hyunyoung Song [Fri, 5 May 2017 20:52:48 +0000 (20:52 +0000)]
Merge "Fix issue in InsetDrawable where master inset attribute get ignored. Test: builds, and did manual test b/
37752336" into oc-dev
Abodunrinwa Toki [Fri, 5 May 2017 20:35:04 +0000 (20:35 +0000)]
Merge "Reject smart selection if outside original selection." into oc-dev
am:
6dcae2b91f
Change-Id: I34bd3e3833d5d7cd52264a5aa34bee18c51bb095
Akira Oshimi [Fri, 5 May 2017 20:32:52 +0000 (20:32 +0000)]
Merge "Update carrier text when phone service state is changed" into oc-dev
am:
ea4e770ed9
Change-Id: I0f385dd77dd42d1ad8ddc3784c0b5c8d1181a596
TreeHugger Robot [Fri, 5 May 2017 20:29:27 +0000 (20:29 +0000)]
Merge "Reject smart selection if outside original selection." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 20:25:44 +0000 (20:25 +0000)]
Merge "Update carrier text when phone service state is changed" into oc-dev
Makoto Onuki [Fri, 5 May 2017 20:16:49 +0000 (20:16 +0000)]
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev
am:
9ccb15a351
Change-Id: I7f246f362b6e8d124416db790e4856e52baa21b8
Rebecca Silberstein [Fri, 5 May 2017 20:11:22 +0000 (20:11 +0000)]
Merge "WifiManagerTest: alt way to check callback" into oc-dev
am:
52fbde5255
Change-Id: I6aaf92372ec62b1d7775492b56ac908f09cf056f
Makoto Onuki [Fri, 5 May 2017 20:11:02 +0000 (20:11 +0000)]
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 20:04:14 +0000 (20:04 +0000)]
Merge "WifiManagerTest: alt way to check callback" into oc-dev
Colin Cross [Fri, 5 May 2017 00:58:11 +0000 (17:58 -0700)]
Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.
Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
(cherry picked from commit
c8ed45d38f3b42e06c9e0980e133a84181752b5e)
Todd Kennedy [Fri, 5 May 2017 19:56:16 +0000 (19:56 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev
am:
4804e41574
Change-Id: I181cb62756b16971b126c2174eea58788dd5bfea
Sergey Vasilinets [Fri, 5 May 2017 19:51:04 +0000 (19:51 +0000)]
Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev
am:
01a5cc9004
Change-Id: I52ea2290a175df2dcd5b3805f7e5943e387133da
TreeHugger Robot [Fri, 5 May 2017 19:35:22 +0000 (19:35 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev
Sergey Vasilinets [Fri, 5 May 2017 19:31:47 +0000 (19:31 +0000)]
Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev
Daniel Nishi [Fri, 5 May 2017 19:16:56 +0000 (19:16 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
am:
4e9002e69a
Change-Id: Ief5f223fd09e6cb78e903276a2270c6fbae2e0cf
Amith Yamasani [Fri, 5 May 2017 19:15:05 +0000 (19:15 +0000)]
Merge "Update process state after unbinding a service." into oc-dev
am:
f57b93cd0a
Change-Id: I9d880df13dec03cf5604c197c5bc4ee99a455693
Android Build Merger (Role) [Fri, 5 May 2017 19:11:26 +0000 (19:11 +0000)]
Merge "Merge "Reduce hwui CPU time by using glDrawRangeElements" am:
057c7c3164 am:
94f4f5e45f am:
b5facc7516" into oc-dev-plus-aosp
Arun [Fri, 5 May 2017 19:10:21 +0000 (19:10 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements" am:
057c7c3164 am:
94f4f5e45f
am:
b5facc7516
Change-Id: I9e96bf83ae5ebd4237fc4d78a58e83793de86aad
Seigo Nonaka [Fri, 5 May 2017 19:05:18 +0000 (19:05 +0000)]
Merge "Resolve styles by font table if not specified." into oc-dev
am:
1ea3a2600b
Change-Id: I8c99a582e4453ec0dfbe6e30650b6682f68e255a
Arun [Fri, 5 May 2017 19:04:45 +0000 (19:04 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements" am:
057c7c3164
am:
94f4f5e45f
Change-Id: I163bfb74ded3d7eacc5221980733099ca1d90002
Geoffrey Pitsch [Fri, 5 May 2017 19:01:40 +0000 (19:01 +0000)]
Merge "Revert "Treat apps that use channels as O apps"" into oc-dev
am:
e2361d978b
Change-Id: I3364dd67095ffcf25a4d33e0c25cc93d2cc7aa50
Arun [Fri, 5 May 2017 18:58:47 +0000 (18:58 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements"
am:
057c7c3164
Change-Id: I32269ea47f637597efc73acc4e040c209b48a2ed
Daniel Nishi [Fri, 5 May 2017 18:57:41 +0000 (18:57 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
Ajay Panicker [Fri, 5 May 2017 18:55:41 +0000 (18:55 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev
am:
73971b2a43
Change-Id: I899cf09b716c4b28c829f96e15760a897d45e293
TreeHugger Robot [Fri, 5 May 2017 18:51:56 +0000 (18:51 +0000)]
Merge "Update process state after unbinding a service." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 18:51:21 +0000 (18:51 +0000)]
Merge "Resolve styles by font table if not specified." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 18:50:52 +0000 (18:50 +0000)]
Merge "Revert "Treat apps that use channels as O apps"" into oc-dev
Treehugger Robot [Fri, 5 May 2017 18:50:11 +0000 (18:50 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements"
Ajay Panicker [Fri, 5 May 2017 18:45:08 +0000 (18:45 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev
Akira Oshimi [Tue, 31 Jan 2017 05:34:59 +0000 (14:34 +0900)]
Update carrier text when phone service state is changed
The carrier text is not updated when the phone service state has
changed. To solve this issue, the EmergencyCryptkeeperText view should
receive the KeyguardUpdateMonitorCallback#onRefreshCarrierInfo().
Bug:
37331677
Test: visual
Change-Id: I359991688552b731eaa02f443902eb7bdc894d10
(cherry picked from commit
76c36c4dc5eb2195c918590b23c16f6410a52df0)
Winson Chung [Fri, 5 May 2017 18:11:46 +0000 (18:11 +0000)]
Merge "Fixing regression in what is considered a restart attempt" into oc-dev
am:
9fb50954e1
Change-Id: Iecb3788c10b4a5dbac5ed0a741fe04a2950d1033
Rebecca Silberstein [Tue, 2 May 2017 20:21:00 +0000 (13:21 -0700)]
WifiManagerTest: alt way to check callback
We are seeing failures on automated tests. This is occuring when the
thread id is retrieved from the TestLooper. Since we do not have
control over exactly which thread is used in the TestLooper for these
environments, this CL changes the checks to make sure the the callback
is called, and also that we never attempt to get the main looper (the
behavior when the provided handler is null).
Bug:
37828843
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I853c423b5f383225c250357d638c4cfd2c098edc
TreeHugger Robot [Fri, 5 May 2017 18:03:49 +0000 (18:03 +0000)]
Merge "Fixing regression in what is considered a restart attempt" into oc-dev
Abodunrinwa Toki [Fri, 5 May 2017 17:55:41 +0000 (17:55 +0000)]
Merge "TextClassifier: Remove debug logs." into oc-dev
am:
dc4fc1ebc2
Change-Id: Ie5d929f463a1917f4e9d4f83e32ba95f359d041a
TreeHugger Robot [Fri, 5 May 2017 17:49:38 +0000 (17:49 +0000)]
Merge "TextClassifier: Remove debug logs." into oc-dev
Todd Kennedy [Fri, 5 May 2017 17:15:38 +0000 (17:15 +0000)]
Create auxiliary info for local instant apps
This reverts commit
a1d8051fa2317d897a6b20442177e357172e93db.
Change-Id: Ic471a4efe64406dd75cc0bf1d6464276a94347d8
Fixes:
37947648
Test: Manual
Test: Install an instant app [https://www.nytimes.com/crosswords/game/mini]
Test: Try to run installed instant app from gMail
Wei Wang [Fri, 5 May 2017 17:23:35 +0000 (17:23 +0000)]
Merge "Add wifi throttling to backup blacklist." into oc-dev
am:
2cd2d23440
Change-Id: Ibfa48a05769784cf688e5b35695c3a8369ac263c
TreeHugger Robot [Fri, 5 May 2017 17:15:48 +0000 (17:15 +0000)]
Merge "Add wifi throttling to backup blacklist." into oc-dev
Abodunrinwa Toki [Fri, 5 May 2017 17:07:17 +0000 (18:07 +0100)]
Reject smart selection if outside original selection.
- The aim is to be defensive and prefer to reject a selection if
it is likely to be wrong.
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug:
38019270
Change-Id: I35ebc84fb102373949366296434a31d899edfef3
Daniel Sandler [Fri, 5 May 2017 17:01:07 +0000 (17:01 +0000)]
Merge "Make status bar disable() debugging more concise." into oc-dev
am:
e39fa61e0b
Change-Id: I13a6417ab49e03a8c636740d59068dd5dc7d702d
Geoffrey Pitsch [Fri, 5 May 2017 16:47:38 +0000 (16:47 +0000)]
Revert "Treat apps that use channels as O apps"
This reverts commit
07a08b2ae92cc26b5e7ec00064e6ecea79d3d9c3.
Bug:
38016678
Change-Id: I0bf2f6da9e145bfe1f79449cac38ad34f5956969
Daniel Sandler [Fri, 5 May 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Make status bar disable() debugging more concise." into oc-dev
Bryce Lee [Fri, 5 May 2017 16:46:20 +0000 (16:46 +0000)]
Merge "Prevent NPE in ActivityStack#shouldbeVisible." into oc-dev
am:
a087127e77
Change-Id: I3c8bfb7fb2961dfef71b7903f78d20ff21f0dc84
Geoffrey Pitsch [Fri, 5 May 2017 16:36:21 +0000 (16:36 +0000)]
Merge "Fix settings test for show_notification_channel_warnings" into oc-dev
am:
2d2689add7
Change-Id: Iac6657120054846aafff07b2335b631e350a7445
Seigo Nonaka [Thu, 4 May 2017 23:39:28 +0000 (16:39 -0700)]
Resolve styles by font table if not specified.
android:fontStyle and android:fontWeight is an optional attribute.
If they are missing, we are using non-italic 400 weight, but this is
not good idea. We should resolve these style value from font metadata.
Bug:
37988154
Test: am instrument -w -e class android.content.res.cts.ResourcesTest
android.content.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I80a436cd3632d8c58fa3d8bdaedac73b95f61a8c
Bryce Lee [Fri, 5 May 2017 16:29:37 +0000 (16:29 +0000)]
Merge "Prevent NPE in ActivityStack#shouldbeVisible." into oc-dev
Rebecca Silberstein [Fri, 5 May 2017 16:23:54 +0000 (16:23 +0000)]
Merge "WifiManagerTest: test for startLOHS return code" into oc-dev
am:
f8d909c14a
Change-Id: I0f43de95419ba442d53b676f1129f0782d2aac71
TreeHugger Robot [Fri, 5 May 2017 16:20:53 +0000 (16:20 +0000)]
Merge "Fix settings test for show_notification_channel_warnings" into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 16:20:19 +0000 (16:20 +0000)]
Merge "Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev am:
97258cd731" into oc-dev-plus-aosp
TreeHugger Robot [Fri, 5 May 2017 16:16:31 +0000 (16:16 +0000)]
Merge "Add (disabled) time zone update system server impl" into oc-dev-plus-aosp
Eino-Ville Talvala [Fri, 5 May 2017 16:14:14 +0000 (16:14 +0000)]
Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev
am:
97258cd731
Change-Id: I1dc7bb61cbf636301aa12070732aff095ede9f2d
Neil Fuller [Thu, 16 Mar 2017 18:32:21 +0000 (18:32 +0000)]
Add (disabled) time zone update system server impl
This commit builds on top of prior API commits. It
adds code to the system server, but in a disabled way.
The system server is responsible for monitoring two
(configured) package names: one for the "updater app"
(provided by the platform) and one for the "data app"
(provided by the OEM). When either package changes
the updater app is triggered via a privileged
intent.
The updater is then required to communicate with the
data app and report back to the system server.
Unit tests are included for the major components.
To run:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
This contains a cherry-pick / conflict resolution of
commit
68f666693a465eb8a66d9252b7b7ac035b9f0b7b after an automerger skip.
(cherry picked from commit
68f666693a465eb8a66d9252b7b7ac035b9f0b7b)
Test: See above.
Bug:
31008728
Merged-In: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
Change-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
Rebecca Silberstein [Fri, 5 May 2017 16:06:50 +0000 (16:06 +0000)]
Merge "WifiManagerTest: test for startLOHS return code" into oc-dev
Eino-Ville Talvala [Fri, 5 May 2017 16:06:03 +0000 (16:06 +0000)]
Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev
Winson Chung [Fri, 5 May 2017 16:03:04 +0000 (16:03 +0000)]
Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev
am:
20d2450da4
Change-Id: Ia1847864ba71c80870e550c653f9c3cb1c91267c
Bryce Lee [Fri, 5 May 2017 15:54:41 +0000 (15:54 +0000)]
Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev
am:
8cfb1a95da
Change-Id: I63d6a84c78f52d9ee20bdf719ac4edbca34fb44d
Winson Chung [Fri, 5 May 2017 01:25:21 +0000 (18:25 -0700)]
Fixing regression in what is considered a restart attempt
- CTS tests can start activities directly in the pinned stack with the
CLEAR_TASK and NEW_TASK flags, so this check should only consider it
a restart attempt if mReusedTask is set, as in
setTaskFromIntentActivity(), otherwise the newly started activity
will be triggered back into fullscreen.
Bug:
37501224
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Ia37f9d77bfb85882e50271300234bfc6c2969f9a
Winson Chung [Fri, 5 May 2017 15:52:13 +0000 (15:52 +0000)]
Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 15:49:47 +0000 (15:49 +0000)]
Merge "Merge "Convert libhwui to Android.bp" am:
31fb17bbf9 am:
f0d951361b am:
ab8ed8b4e4 -s ours" into oc-dev-plus-aosp
Jorim Jaggi [Fri, 5 May 2017 15:47:24 +0000 (15:47 +0000)]
Merge "Add TRON logging for bindApplication" into oc-dev
am:
802d008e1b
Change-Id: Idc3dba8c4559098b0b06d8159000fe7857675887
Bryce Lee [Fri, 5 May 2017 15:46:32 +0000 (15:46 +0000)]
Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev
Colin Cross [Fri, 5 May 2017 15:45:44 +0000 (15:45 +0000)]
Merge "Convert libhwui to Android.bp" am:
31fb17bbf9 am:
f0d951361b
am:
ab8ed8b4e4 -s ours
Change-Id: I483940304816785a10c8eaa5eff0def36c6d0a0d
Jean-Michel Trivi [Fri, 5 May 2017 15:45:26 +0000 (15:45 +0000)]
Merge "Audio service: always unduck focus winner" into oc-dev
am:
a78b6e7757
Change-Id: I09bf332200f5f67b6832e1f94992d6e2eb053c02
Colin Cross [Fri, 5 May 2017 15:39:20 +0000 (15:39 +0000)]
Merge "Convert libhwui to Android.bp" am:
31fb17bbf9
am:
f0d951361b
Change-Id: I30dee10c1e024777a3760d37cf5a80e79c083b2a
Bryce Lee [Fri, 5 May 2017 15:38:44 +0000 (15:38 +0000)]
Revert "Create auxiliary info for local instant apps"
This reverts commit
e15e7cb592a923eea029c12aa9fc144a3fbaddc0.
Change-Id: I116904fd8c2b28df7e03bc5ec2414ed67761b380
Jorim Jaggi [Fri, 5 May 2017 15:34:52 +0000 (15:34 +0000)]
Merge "Add TRON logging for bindApplication" into oc-dev
Jean-Michel Trivi [Fri, 5 May 2017 15:33:42 +0000 (15:33 +0000)]
Merge "Audio service: always unduck focus winner" into oc-dev
Colin Cross [Fri, 5 May 2017 15:28:42 +0000 (15:28 +0000)]
Merge "Convert libhwui to Android.bp"
am:
31fb17bbf9
Change-Id: I66401c892f90131e21efb36dc7316f905bd729d2
Treehugger Robot [Fri, 5 May 2017 15:17:21 +0000 (15:17 +0000)]
Merge "Convert libhwui to Android.bp"
Arun [Mon, 23 Jan 2017 11:41:06 +0000 (11:41 +0000)]
Reduce hwui CPU time by using glDrawRangeElements
The CPU overhead of glDrawElements in the GPU driver is significant
with client-side vertex data (unique per draw call) as the driver has
to calculate the mininimum and maximum indices from the index buffer
in order to evaluate the range of vertex data required. This can be
avoided by keeping track of the min-max in hwui and passing it with
glDrawRangeElements. This requires OpenGL ES3.0 support (which is
already checked for elsewhere in hwui).
Test: manual - visual inspection on fugu (nexus player)
Change-Id: I57bb1ddd239a1032f74f1cd2683bbe0970e84bd9
Jorim Jaggi [Fri, 5 May 2017 15:06:26 +0000 (15:06 +0000)]
Merge "Fix bounds calculation" into oc-dev
am:
d1422b56ad
Change-Id: I302c46401b5251a0b82d0e704424bacd687893f8
Jorim Jaggi [Fri, 5 May 2017 14:59:39 +0000 (14:59 +0000)]
Merge "Fix bounds calculation" into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 14:33:50 +0000 (14:33 +0000)]
Merge "Merge "Add (disabled) time zone update system server impl" am:
cba224e833 am:
0a6aeccab2 am:
5175e734a1 -s ours" into oc-dev-plus-aosp
Neil Fuller [Fri, 5 May 2017 14:32:58 +0000 (14:32 +0000)]
Merge "Add (disabled) time zone update system server impl" am:
cba224e833 am:
0a6aeccab2
am:
5175e734a1 -s ours
Change-Id: I5f1dbfdd97027845904b99b01d39afc58bf8e6c4
Todd Kennedy [Fri, 5 May 2017 14:30:09 +0000 (14:30 +0000)]
Merge "Don't set the failure extra on split install" into oc-dev
am:
d14e67656f
Change-Id: I8c317e316b699d742db50b2b642f2d1b0304de57
Todd Kennedy [Fri, 5 May 2017 14:27:55 +0000 (14:27 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev
am:
d55670bcf5
Change-Id: Ia0fe6ae25879711ae0c9cf92a71607a5d7c5f4dc
Neil Fuller [Fri, 5 May 2017 14:23:04 +0000 (14:23 +0000)]
Merge "Add (disabled) time zone update system server impl" am:
cba224e833
am:
0a6aeccab2
Change-Id: Idbd7614472b51a87e217bb21720ecfb0b063d237
TreeHugger Robot [Fri, 5 May 2017 14:21:14 +0000 (14:21 +0000)]
Merge "Don't set the failure extra on split install" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 14:20:47 +0000 (14:20 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev
Neil Fuller [Fri, 5 May 2017 14:17:02 +0000 (14:17 +0000)]
Merge "Add (disabled) time zone update system server impl"
am:
cba224e833
Change-Id: I603af513ae8170a1fac6e2e2fdc364ecbea0abfd
Bryce Lee [Fri, 5 May 2017 14:14:12 +0000 (14:14 +0000)]
Merge "Finish noHistory activities immediately after resumed activity shown." into oc-dev
am:
c589f1b1f7
Change-Id: I69284fa04066ef823a1420df733a1938be3961a7
Bryce Lee [Thu, 4 May 2017 17:19:07 +0000 (10:19 -0700)]
Prevent NPE in ActivityStack#shouldbeVisible.
If there is a visibleBehind activity, we check to see if the top
activity in the top stack is not fullscreen. However, it is possible
for the top stack to be empty. This can happen if the previously top
activity is being re-installed.
This changelist addresses the issue by checking if the top activity is
null before referencing it.
Change-Id: I6de904bed1c7035ed1e112c9cacc1b6c2bac4e8f
Fixes:
32180256
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackTests#testShouldBeVisibleWithVisibleBehindActivity
Bryce Lee [Fri, 5 May 2017 14:08:21 +0000 (14:08 +0000)]
Merge "Finish noHistory activities immediately after resumed activity shown." into oc-dev
Treehugger Robot [Fri, 5 May 2017 14:06:23 +0000 (14:06 +0000)]
Merge "Add (disabled) time zone update system server impl"
Jorim Jaggi [Fri, 5 May 2017 13:05:07 +0000 (15:05 +0200)]
Add TRON logging for bindApplication
Such that we know how much startup latency is the system to blame
and how much of it is the client process to blame.
Test: Open dead app, inspect logs
Change-Id: Ib8d359c2d59ef6f90893928f2b1d4e2ac2590d74
Fixes:
37327717
Jorim Jaggi [Thu, 4 May 2017 12:05:59 +0000 (14:05 +0200)]
Fix bounds calculation
Don't include the wallpaper window when calculating the frame
in multi-window.
Test: Go multi-window, go recents.
Change-Id: I8b4fb48767d6bdbda055d9c631811ad5a1dcaee6
Fixes:
36240988
Bill Yi [Fri, 5 May 2017 12:30:36 +0000 (12:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f996c71431 -s ours
Change-Id: I6a9d2f7b3d69c6ea5bbd60496e101f362bed07b6
Bill Yi [Fri, 5 May 2017 12:24:37 +0000 (12:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
288e7f54d0 -s ours
Change-Id: Ic0f9b8e1ab1cda9bcacd8c2db6a9cf3d909c12e8
TreeHugger Robot [Fri, 5 May 2017 12:24:02 +0000 (12:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 12:14:06 +0000 (12:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Michael Wright [Fri, 5 May 2017 12:11:16 +0000 (12:11 +0000)]
Merge "Remove line from bad resolution merge." into oc-dev-plus-aosp
Android Build Merger (Role) [Fri, 5 May 2017 12:07:26 +0000 (12:07 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
8d95e04111 -s ours" into oc-dev-plus-aosp
Bill Yi [Fri, 5 May 2017 12:06:42 +0000 (12:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
8d95e04111 -s ours
Change-Id: I4572d5501da94623679e96e4102c9ab3ac3f3982
Nicolas Geoffray [Fri, 5 May 2017 12:01:15 +0000 (13:01 +0100)]
Remove line from bad resolution merge.
Test: build
Change-Id: Ie7f9187ecf63150b9ea36858e80e226c6daaa184
Bill Yi [Fri, 5 May 2017 12:00:05 +0000 (12:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
8d95e04111 -s ours
Change-Id: I2306f269edb62724a2c087e3f9509e5c938942fb
TreeHugger Robot [Fri, 5 May 2017 11:54:04 +0000 (11:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Narayan Kamath [Fri, 5 May 2017 10:59:06 +0000 (10:59 +0000)]
Merge "ActivityManagerService: Add an overall stack dumping timeout." into oc-dev
am:
e7e6ce027c
Change-Id: I3604cc1238704632b9f5061c58d2dd43f5d95a9a
TreeHugger Robot [Fri, 5 May 2017 10:56:41 +0000 (10:56 +0000)]
Merge "ActivityManagerService: Add an overall stack dumping timeout." into oc-dev
Jorim Jaggi [Fri, 5 May 2017 10:47:38 +0000 (10:47 +0000)]
Merge "Don't include IME in app screenshot" into oc-dev
am:
4b8f68fd52
Change-Id: If1d1b6a80748c479915ec020b5a97373bdcafda9