OSDN Git Service
Zak Cohen [Thu, 26 Jan 2017 21:54:28 +0000 (13:54 -0800)]
Introduces VrManager as a system service.
Provides access to persistent VR mode as used by VR viewer when a device
is believed to be inside a viewer.
Bug:
34736524
Test: Built, run using build of vr services that enables mode.
Change-Id: I6ff392f09adb8e4bd522dacbd064777bba836282
Jason Long [Sun, 5 Feb 2017 18:32:20 +0000 (18:32 +0000)]
Merge changes I0e808083,Iade6179f,If0d0a283
* changes:
Hide DatasetPicker if all items are filtered.
Improve AnchoredWindow with smart positioning logic.
Pass token to AutoFillUI.
TreeHugger Robot [Sat, 4 Feb 2017 21:41:00 +0000 (21:41 +0000)]
Merge "Make activities that are in VR mode ignore ui mode config changes."
Jean-Michel Trivi [Sat, 4 Feb 2017 19:10:08 +0000 (19:10 +0000)]
Merge "Debug flag off on audio service PlaybackActivityMonitor"
Jean-Michel Trivi [Fri, 3 Feb 2017 18:18:23 +0000 (10:18 -0800)]
Debug flag off on audio service PlaybackActivityMonitor
Test: check no logs from PlaybackActivityMonitor when playing audio
Bug
34974646
Change-Id: I6f67abc5a5e80cf61dc3ca4d0dc29f6fe902c4a7
Pierre Lecesne [Sat, 4 Feb 2017 03:54:39 +0000 (03:54 +0000)]
Merge "Only compress files that were already compressed in the original APK."
TreeHugger Robot [Sat, 4 Feb 2017 03:47:34 +0000 (03:47 +0000)]
Merge "Fix start delay for ValueAnimator"
Adam Lesinski [Sat, 4 Feb 2017 03:44:21 +0000 (03:44 +0000)]
Merge "AAPT2: Support CtsContentTestCases build"
TreeHugger Robot [Sat, 4 Feb 2017 03:14:10 +0000 (03:14 +0000)]
Merge "Shift responsibility of DB cleanup to TvProvider"
Doris Liu [Sat, 4 Feb 2017 00:49:20 +0000 (16:49 -0800)]
Fix start delay for ValueAnimator
This CL ensures that doAnimationFrame() is called the frame
after start() is called, so that AnimatorSet can pulse frames
into single animators as soon as they are start()'ed.
Test: new cts test in same topic branch
Change-Id: I4f9522ce9e1a54ca3bcad6c696e6b248c945ff90
Dmitry Dementyev [Sat, 4 Feb 2017 01:51:27 +0000 (01:51 +0000)]
Merge "Fix AccountsDb update."
Dmitry Dementyev [Sat, 4 Feb 2017 01:46:10 +0000 (17:46 -0800)]
Fix AccountsDb update.
Test: manual tests.
Change-Id: I32881f0b77e79e218020dfa7ef921ddeb95de1b7
Andy Hung [Sat, 4 Feb 2017 01:43:10 +0000 (01:43 +0000)]
Merge "AudioTrack: Enable deep buffer under certain conditions"
TreeHugger Robot [Sat, 4 Feb 2017 01:34:06 +0000 (01:34 +0000)]
Merge "Rename isCallerSystemUid()."
TreeHugger Robot [Sat, 4 Feb 2017 01:31:49 +0000 (01:31 +0000)]
Merge "Removed android.R.attr#onTopLauncher"
TreeHugger Robot [Sat, 4 Feb 2017 01:29:32 +0000 (01:29 +0000)]
Merge "SystemUI: Add LightBarController dump"
TreeHugger Robot [Sat, 4 Feb 2017 01:18:18 +0000 (01:18 +0000)]
Merge "Update Account Discovery API."
Dianne Hackborn [Sat, 4 Feb 2017 01:10:20 +0000 (01:10 +0000)]
Merge "Implement issue #
30977956: Enable Instrumentation tests for multi-process apps"
Adrian Roos [Sat, 4 Feb 2017 01:00:36 +0000 (01:00 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons"
TreeHugger Robot [Sat, 4 Feb 2017 01:00:03 +0000 (01:00 +0000)]
Merge "TIF: use @StringDef annotations in TvContract"
Dianne Hackborn [Tue, 31 Jan 2017 23:27:13 +0000 (15:27 -0800)]
Implement issue #
30977956: Enable Instrumentation tests for multi-process apps
New android:targetProcess attribute on <instrumentation> allows you to
specify the processes the instrumentation will run in.
This reworks how instrumentation is run in the activity manager to better
formalize its state and semantics, allowing us to keep track of it across
multiple processes. This also clearly defines what happens when multiple
instrumentations are running at the same time, which is useful for writing
CTS tests that test the instrumentation APIs themselves.
Adds a couple new APIs to Instrumentation that helps with the new
situation where instrumentation can run concurrently in multiple processes.
Test: new CTS tests added (textXxxProcessInstrumentation in
ActivityManagerTest.java in cts/tests/app/src)
Change-Id: I2811e6c75bc98d4856045b2f0a45fb24af5d366f
Adrian Roos [Fri, 3 Feb 2017 23:47:43 +0000 (15:47 -0800)]
SystemUI: Add LightBarController dump
Test: adb shell dumpsys activity service com.android.systemui
Bug:
34198865
Change-Id: I7b109449b3d5e392a55740a8237bd43c509089a7
Jeremy Joslin [Fri, 3 Feb 2017 23:47:23 +0000 (23:47 +0000)]
Merge "Cache NetworkScorerAppData in the ScoringServiceConnection."
Wale Ogunwale [Fri, 3 Feb 2017 15:58:14 +0000 (07:58 -0800)]
Removed android.R.attr#onTopLauncher
The product that the feature was intended for never launched, so
removing the complexity from the code base.
Test: builds
Change-Id: I75e60ee2da46f6012f03a6077f77bc6b9acecad5
Conrad Chen [Thu, 2 Feb 2017 01:13:29 +0000 (17:13 -0800)]
Shift responsibility of DB cleanup to TvProvider
Test: remove function
Bug:
34884862
Change-Id: I65b1925af5efae2efa8c8c24fae23e4e3a469e4e
Jack Yu [Fri, 3 Feb 2017 23:29:55 +0000 (23:29 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
Jeremy Joslin [Fri, 3 Feb 2017 17:13:51 +0000 (09:13 -0800)]
Rename isCallerSystemUid().
The method wasn't actually checking if the caller was
Process.SYSTEM_UID, nor was that it's intent.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Change-Id: I341f2fb1d1dca0a460140992a68831316daa4eb8
Jason Long [Fri, 3 Feb 2017 08:47:04 +0000 (00:47 -0800)]
Hide DatasetPicker if all items are filtered.
Bug:
34633695
Test: CTS
Change-Id: I0e808083d32db9e280c9ddd028239540bac01cfc
Jason Long [Wed, 1 Feb 2017 17:29:39 +0000 (09:29 -0800)]
Improve AnchoredWindow with smart positioning logic.
* Add appToken.
* Add mWindowSizeListenerView for getting the displayable window size
(screen - system windows - soft input).
* Add mContentView when we have all the necesssary info.
* Change mContentView only if something changes (height, bounds,
displayBounds).
Bug:
34637800
Test: CTS
Change-Id: Iade6179f6303a6d4777e99fa6c600ba6352ee863
Matthew Ng [Fri, 3 Feb 2017 22:37:27 +0000 (22:37 +0000)]
Merge "Revert "Fix window transformation related issue""
Jason Monk [Fri, 3 Feb 2017 22:30:47 +0000 (22:30 +0000)]
Merge "Fix the tests"
Adrian Roos [Tue, 31 Jan 2017 23:10:00 +0000 (15:10 -0800)]
StatusBar: Catch OOM caused by third-party icons
Bug:
31825355
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
Change-Id: I3e2a8c3da43a572a026ea0bbe1d39234035a4801
Chris Tate [Fri, 3 Feb 2017 22:14:10 +0000 (22:14 +0000)]
Merge "Make job startup timeout similar to base OS service launch timeout"
Chris Craik [Fri, 3 Feb 2017 22:11:35 +0000 (22:11 +0000)]
Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE" am:
6678d34133 -s ours am:
6385d23f43 -s ours am:
7a0720e22c
am:
5ab6c2f291 -s ours
Change-Id: Ide896b5db2ba86bd66d5fdb237a1e0dd498e9ff6
Steven Thomas [Fri, 3 Feb 2017 22:05:28 +0000 (22:05 +0000)]
Merge "Disable VR compatibility display"
Chris Craik [Fri, 3 Feb 2017 22:03:53 +0000 (22:03 +0000)]
Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE" am:
6678d34133 -s ours am:
6385d23f43 -s ours
am:
7a0720e22c
Change-Id: Idc55c41fdbad5ef6a81d753d2acad34b81137586
Paul Lawrence [Fri, 3 Feb 2017 22:02:35 +0000 (22:02 +0000)]
Merge "Expand whitelist" am:
fe88a5e81d am:
f907b0fcc7 am:
edc3f365a0
am:
6320e20955
Change-Id: Icc2326064d010596918081487f69a37d0b0988dd
Paul Lawrence [Fri, 3 Feb 2017 21:58:03 +0000 (21:58 +0000)]
Merge "Expand whitelist" am:
fe88a5e81d am:
f907b0fcc7
am:
edc3f365a0
Change-Id: I51bc6c7b90c2e93942c62c0eb49c13b19581a0d9
Chris Craik [Fri, 3 Feb 2017 21:57:58 +0000 (21:57 +0000)]
Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE" am:
6678d34133 -s ours
am:
6385d23f43 -s ours
Change-Id: Ifbd64ab5edd16d84aa252408b1ceafc0a713321c
Tyler Gunn [Fri, 3 Feb 2017 21:57:09 +0000 (21:57 +0000)]
resolve merge conflicts of
d04c51ea372a to nyc-mr2-dev-plus-aosp
am:
5819755163 -s ours
Change-Id: I2cdccaa724f76b3b1aaacd328984284709b5d166
Chris Craik [Fri, 3 Feb 2017 21:53:26 +0000 (21:53 +0000)]
Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE"
am:
6678d34133 -s ours
Change-Id: I841f908f57d94ee91c72ef2c6d428cc1f14a5690
Chris Craik [Fri, 3 Feb 2017 21:44:34 +0000 (21:44 +0000)]
Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE"
Tyler Gunn [Fri, 3 Feb 2017 21:40:45 +0000 (13:40 -0800)]
resolve merge conflicts of
d04c51ea372a to nyc-mr2-dev-plus-aosp
Test: Fix build.
Change-Id: I5808fc02502ced2195728ad146ef5523a8eb19ae
Paul Lawrence [Fri, 3 Feb 2017 21:28:30 +0000 (21:28 +0000)]
Merge "Expand whitelist" am:
fe88a5e81d
am:
f907b0fcc7
Change-Id: Ifb2506e0f8cf697d1bbd4eb0ea744ed8fc9d2b63
Paul Lawrence [Fri, 3 Feb 2017 21:23:55 +0000 (21:23 +0000)]
Merge "Expand whitelist"
am:
fe88a5e81d
Change-Id: I9bc80af8b045edb667840828fc84f2e0ab12863b
Dongwon Kang [Fri, 3 Feb 2017 21:19:14 +0000 (13:19 -0800)]
TIF: use @StringDef annotations in TvContract
Test: build
Bug:
34949964
Change-Id: I59ec8ff245f36a1981a012349892114fe26d5265
Paul Lawrence [Fri, 3 Feb 2017 21:16:59 +0000 (21:16 +0000)]
Merge "Expand whitelist"
Tyler Gunn [Fri, 3 Feb 2017 21:15:36 +0000 (21:15 +0000)]
Merge "Add "wifi lost" disconnect cause." am:
802b0c8fd1
am:
4e26b8e75e
Change-Id: I783d8693258d31341d946fa1f20e4c744ee410b3
Tyler Gunn [Fri, 3 Feb 2017 21:10:39 +0000 (21:10 +0000)]
Merge "Add "wifi lost" disconnect cause."
am:
802b0c8fd1
Change-Id: I2f1ac8f8d8874f30720790888fa4e6beabc03c91
Fyodor Kupolov [Fri, 3 Feb 2017 21:09:31 +0000 (21:09 +0000)]
Merge "Use self-locking for mAvailableFeatures"
Tyler Gunn [Fri, 3 Feb 2017 21:03:22 +0000 (21:03 +0000)]
Merge "Add "wifi lost" disconnect cause."
Peter Qiu [Fri, 3 Feb 2017 21:02:36 +0000 (21:02 +0000)]
Merge changes from topic 'Passpoint API rename'
* changes:
hotspot2: expose Passpoint APIs as public
hotspot2: fix class/function/variable names to comply with API guideline
hotspot2: rename classes to comply with API guideline
Tyler Gunn [Fri, 3 Feb 2017 20:55:28 +0000 (20:55 +0000)]
Merge "Add "wifi lost" disconnect cause."
Netta Peterbursky [Fri, 3 Feb 2017 20:50:09 +0000 (20:50 +0000)]
Merge "Protobufferize BatteryManager dumpsys"
Christopher Tate [Fri, 3 Feb 2017 02:07:42 +0000 (18:07 -0800)]
Make job startup timeout similar to base OS service launch timeout
Bug
34464989
Change-Id: I4c0f5d8303e682bcb19a3f3c2d6be33b810a1f6e
Paul Lawrence [Fri, 3 Feb 2017 20:32:12 +0000 (20:32 +0000)]
Merge "Optimize seccomp" am:
7e812616c9 am:
9375f3eff6 am:
38b7d83f8e
am:
63e0f2f98d
Change-Id: Ib65f9dc785ce3e40bd03d04ed388a36100946e1b
Paul Lawrence [Fri, 3 Feb 2017 20:27:30 +0000 (20:27 +0000)]
Merge "Optimize seccomp" am:
7e812616c9 am:
9375f3eff6
am:
38b7d83f8e
Change-Id: Ia48dba402b42dcd449507ea34a438e2a14d4164f
Paul Lawrence [Fri, 3 Feb 2017 20:22:49 +0000 (20:22 +0000)]
Merge "Optimize seccomp" am:
7e812616c9
am:
9375f3eff6
Change-Id: I8cc56a3e5512764a02004f27f976e72da554ef38
Paul Lawrence [Fri, 3 Feb 2017 20:19:11 +0000 (20:19 +0000)]
Merge "Optimize seccomp"
am:
7e812616c9
Change-Id: I6061c25fe18b136d9a4920acd3f54043c44abe4a
Jason Monk [Fri, 3 Feb 2017 20:16:21 +0000 (15:16 -0500)]
Fix the tests
Window types changed, need to use a different one
Test: runtest systemui
Change-Id: Iac2641feb49e54af98ac523363d387647552eb0a
Paul Lawrence [Fri, 3 Feb 2017 20:14:14 +0000 (20:14 +0000)]
Merge "Optimize seccomp"
Matthew Ng [Fri, 3 Feb 2017 19:56:08 +0000 (11:56 -0800)]
Revert "Fix window transformation related issue"
This reverts commit
867210c1de62e533880da7ac64b8eaa837e6ed6a.
This commit is being reverted because the logic it tries to fix does not
make sense and caused a regression causing all animation positions to be
offset incorrectly but applying the animation metrics before applying the
window offset (mainly for bottom screen in multiwindow). The original
case this tries to fix is for older apps like gallery2 which crashes
(ramdump) when trying reproduce the steps.
Fixes:
34769878
Test: ran original case that this tried to fix and played with recents
related to the new bug it created
Pierre Lecesne [Fri, 3 Feb 2017 19:15:03 +0000 (19:15 +0000)]
Only compress files that were already compressed in the original APK.
Also fix a log message.
Test: Manually. Unit tests pass.
Change-Id: Iea236bbcfbe1a0a0894ce1bfce09c19208c5a0bc
Chris Craik [Thu, 2 Feb 2017 23:41:58 +0000 (15:41 -0800)]
Add ShadowShaderAnimation benchmark DO NOT MERGE
Bug:
34809371
Test: manual
New benchmark uses several levels of overdraw from just shadows to benchmark
shadow shader performance.
Tessellation workload is minimal, due to simple rect caster shape.
Change-Id: I572476bd54e04566851f39027ada7254597b37f8
TreeHugger Robot [Fri, 3 Feb 2017 19:30:34 +0000 (19:30 +0000)]
Merge "remove SIM_ACTIVATION_RESPONSE_CODE from sysapi"
Zak Cohen [Sun, 29 Jan 2017 20:59:23 +0000 (12:59 -0800)]
Make activities that are in VR mode ignore ui mode config changes.
Going into VR UI mode, when in VR mode, will not cause an activity recreate
on pre-O apps.
Bug:
30989383,
34849643
Test: ran vr mode activity, checked dumpsys uimode for correct values
Change-Id: I0d371cce4920dbf2bdeb84dc6c741d12fc2ce444
Tyler Gunn [Mon, 30 Jan 2017 17:52:55 +0000 (09:52 -0800)]
Add "wifi lost" disconnect cause.
New disconnect cause used when wifi call is dropped due to loss of wifi
connection.
Test: Manual, unit.
Merged-In: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
Bug:
32571209
Change-Id: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
Selim Cinek [Fri, 3 Feb 2017 19:03:03 +0000 (19:03 +0000)]
Merge "Fixed the background for low-priority legacy notifications"
Pierre Lecesne [Thu, 2 Feb 2017 22:38:40 +0000 (22:38 +0000)]
Strip the resources from the APK using the TableSplitter.
Test: Unit tests pass.
Change-Id: I1dd71581113fb9a6feeefa9c794cc282529c3754
Pierre Lecesne [Fri, 3 Feb 2017 18:51:39 +0000 (18:51 +0000)]
Merge "Iterate over the zip entries in order."
Pierre Lecesne [Fri, 3 Feb 2017 18:50:13 +0000 (18:50 +0000)]
Merge "Expose whether a file was compressed before being loaded in memory."
Pierre Lecesne [Fri, 3 Feb 2017 18:49:34 +0000 (18:49 +0000)]
Merge "Add a method LoadedApk::WriteToArchive."
Tyler Gunn [Mon, 30 Jan 2017 17:52:55 +0000 (09:52 -0800)]
Add "wifi lost" disconnect cause.
New disconnect cause used when wifi call is dropped due to loss of wifi
connection.
Test: Manual, unit.
Bug:
32571209
Change-Id: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
Paul Lawrence [Fri, 3 Feb 2017 18:10:32 +0000 (10:10 -0800)]
Expand whitelist
Bug:
34908783
Test: Device boots. Unable to test app due to Fake OEM error
Change-Id: I2a0f5646fa39f95875ecb661599d76f4b28a43ac
Wei Wang [Fri, 3 Feb 2017 17:52:18 +0000 (17:52 +0000)]
Merge "BootAnimation: Add log when animation starts"
Andy Hung [Wed, 1 Feb 2017 03:27:04 +0000 (19:27 -0800)]
AudioTrack: Enable deep buffer under certain conditions
Under certain conditions, i.e. USAGE_MEDIA and
CONTENT_TYPE UNKNOWN, MUSIC, MOVIE and large buffers
we route the AudioTrack to deep buffer to save power.
Change-Id: Ibc8a31750999da842e36156f939448989ee50511
Test: Play Movies, CTS
Bug:
30687201
Jeremy Joslin [Thu, 2 Feb 2017 19:06:14 +0000 (11:06 -0800)]
Cache NetworkScorerAppData in the ScoringServiceConnection.
Store the entire NetworkScorerAppData instance in the
ScoringServiceConnection instead of just most of its fields.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
34773276
Change-Id: Id2ed7c431dee9895e85e1966903ac919f1704eba
TreeHugger Robot [Fri, 3 Feb 2017 10:15:57 +0000 (10:15 +0000)]
Merge "Fix bugs in FontResourcesParser and add coretests"
Bill Yi [Fri, 3 Feb 2017 09:07:49 +0000 (09:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
7acceb8746 -s ours
am:
0a9904d90c -s ours
Change-Id: Ia2b552f8db5f7c947ba13e54bddf6bd235d9256a
Bill Yi [Fri, 3 Feb 2017 09:06:41 +0000 (09:06 +0000)]
Import translations. DO NOT MERGE am:
49a9d35eb7 -s ours
am:
c48ebb548b -s ours
Change-Id: Idb782499f71b009757bb7c1ba8064c7d3e2c18da
Bill Yi [Fri, 3 Feb 2017 09:02:47 +0000 (09:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
7acceb8746 -s ours
Change-Id: I9035c31bada7ae86c4670b8f4c0d17ed4ec61a3e
Bill Yi [Fri, 3 Feb 2017 09:02:42 +0000 (09:02 +0000)]
Import translations. DO NOT MERGE
am:
49a9d35eb7 -s ours
Change-Id: I2c4aa7f43a77a81b529fe0b05b1e51b46ff3e3c9
TreeHugger Robot [Fri, 3 Feb 2017 08:57:20 +0000 (08:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Fri, 3 Feb 2017 08:45:01 +0000 (08:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
d46d030238 -s ours
am:
ca4daf90e0 -s ours
Change-Id: I2a4186b26c2d5e9dc98cdcb717e62d71e844809a
Bill Yi [Fri, 3 Feb 2017 08:44:02 +0000 (08:44 +0000)]
Import translations. DO NOT MERGE am:
37093ca19c -s ours
am:
709924edc2 -s ours
Change-Id: I7e464cfa7412602f5b9e17d6c00492da4d16fe3c
Bill Yi [Fri, 3 Feb 2017 08:42:49 +0000 (08:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
b2d152ee90 -s ours
am:
60752b1f1c -s ours
Change-Id: I7152fdc9d662c2d660f12d111fbb0f466afc8ef3
Bill Yi [Fri, 3 Feb 2017 08:41:38 +0000 (08:41 +0000)]
Import translations. DO NOT MERGE am:
31423f28b7 -s ours
am:
e0d6074cc2 -s ours
Change-Id: I9325b08ccead00ef0cd6a534b539916b885b2bde
Bill Yi [Fri, 3 Feb 2017 08:37:16 +0000 (08:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
362113588f -s ours
am:
28a51455fb -s ours
Change-Id: Ib8f84c6fb015b6c021e31c999bf5a327155a2a50
Bill Yi [Fri, 3 Feb 2017 08:36:13 +0000 (08:36 +0000)]
Import translations. DO NOT MERGE am:
b2d808b3f3 -s ours
am:
83660c7a66 -s ours
Change-Id: Ie22bf56eee0af18b8640fff5a8770ef08ced92df
Bill Yi [Fri, 3 Feb 2017 08:35:16 +0000 (08:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
e2d9a7fef5 -s ours
am:
0b708f9f84 -s ours
Change-Id: I38e8bddff0ec7a630e646512818f417d75b57e62
Bill Yi [Fri, 3 Feb 2017 08:34:26 +0000 (08:34 +0000)]
Import translations. DO NOT MERGE am:
f812207041 -s ours
am:
dd2a43f2a7 -s ours
Change-Id: I571bf9a1863b3ecdab68afade3f5f40a2b28140f
Bill Yi [Fri, 3 Feb 2017 08:32:40 +0000 (08:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
d46d030238 -s ours
Change-Id: Ia8667cafa6bd5444781956939376f4689526f2ff
Bill Yi [Fri, 3 Feb 2017 08:32:36 +0000 (08:32 +0000)]
Import translations. DO NOT MERGE
am:
37093ca19c -s ours
Change-Id: I3788ed72857526a3447937309ea42c0f487d0801
Bill Yi [Fri, 3 Feb 2017 08:31:43 +0000 (08:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a9d4a2cdc5 -s ours
am:
951842afa1 -s ours
Change-Id: Ic6fdc6b4e0d49347dce15511858717a13eb1c40d
Bill Yi [Fri, 3 Feb 2017 08:31:12 +0000 (08:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
b2d152ee90 -s ours
Change-Id: I2d3533869005160f27b38005a43b6cf85e1938d4
Bill Yi [Fri, 3 Feb 2017 08:31:09 +0000 (08:31 +0000)]
Import translations. DO NOT MERGE
am:
31423f28b7 -s ours
Change-Id: I982cfdc9ddd15d1640f465f6c39214a0a106f210
Bill Yi [Fri, 3 Feb 2017 08:30:43 +0000 (08:30 +0000)]
Import translations. DO NOT MERGE am:
ba8e772bbe -s ours
am:
bbed9c1eb3 -s ours
Change-Id: Ic82286e8dd0f471f79c315720c1bd9d74c3b66ce
Bill Yi [Fri, 3 Feb 2017 08:29:46 +0000 (08:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
18891008dc -s ours
am:
3487bfe04e -s ours
Change-Id: I1adca487e6b8db61f08af2eadae52a3f36ea1464
Bill Yi [Fri, 3 Feb 2017 08:28:49 +0000 (08:28 +0000)]
Import translations. DO NOT MERGE am:
8c97416258 -s ours
am:
1a3602d516 -s ours
Change-Id: Ie927f17bfc3b8ef894ca787d793fcbeebd5491f3
Bill Yi [Fri, 3 Feb 2017 08:27:52 +0000 (08:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
ec47322af8 -s ours
am:
e1b47c56a7 -s ours
Change-Id: I892f8ab81f450e84c0e615d0a3471590afec8678
OSDN Git Service
