git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Todd Kennedy [Mon, 3 Apr 2017 18:03:47 +0000 (18:03 +0000)]

Merge "Expose instant app to exposed providers" into oc-dev
am: 644648ebfd

Change-Id: I32fc7de9cd1a0823dd38e5103d85c47776bb1404

commit | commitdiff | tree

Jason Monk [Mon, 3 Apr 2017 18:02:26 +0000 (18:02 +0000)]

Merge "Disable sounds on menu button" into oc-dev
am: 5c8832a983

Change-Id: I16aef7e38de6a154d051f539b9fc8c96db73958a

commit | commitdiff | tree

Jason Monk [Mon, 3 Apr 2017 18:01:17 +0000 (18:01 +0000)]

Merge "Fix battery icon dark initialization" into oc-dev
am: cb4ed821f2

Change-Id: I34cc7adb16ec21ba8c9cf210b3ca61b2c9506290

commit | commitdiff | tree

George Mount [Mon, 3 Apr 2017 17:57:27 +0000 (17:57 +0000)]

Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
am: e9679db5e2

Change-Id: I4192bc42bdc35ff29ac6e3c4ce2bb67f5a412c4b

commit | commitdiff | tree

Diego Perez [Mon, 3 Apr 2017 17:52:17 +0000 (17:52 +0000)]

Merge "Fix broken perf tests" into oc-dev
am: 974b5b13b2

Change-Id: Ic9442beef0e2bec7db53b8e6ef1ff47dc6d12769

commit | commitdiff | tree

Jason Monk [Mon, 3 Apr 2017 17:51:00 +0000 (17:51 +0000)]

Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev
am: a56b6e530a

Change-Id: I43f7dafe192930ce5f3a78db5e586d62ba66a1c4

commit | commitdiff | tree

Jason Monk [Mon, 3 Apr 2017 17:49:45 +0000 (17:49 +0000)]

Merge "Fix losing status bar icons on config changes" into oc-dev
am: f244f7e1b8

Change-Id: I08a75d88e6764703d4c450b9ee5f81a824e2adc9

commit | commitdiff | tree

Todd Kennedy [Mon, 3 Apr 2017 17:46:59 +0000 (17:46 +0000)]

Merge "Implement service filtering" into oc-dev
am: 35110948b7

Change-Id: Ie19ae7075e8fe35857a60306452fe19b06bb1848

commit | commitdiff | tree

Bryce Lee [Mon, 3 Apr 2017 17:41:40 +0000 (17:41 +0000)]

Merge "Add app bounds to configuration." into oc-dev
am: 7efe56b779

Change-Id: If871d90a72f675a93503e883135ebee77f12d971

commit | commitdiff | tree

Chris Wren [Mon, 3 Apr 2017 17:40:29 +0000 (17:40 +0000)]

Merge "standardize network policy notification IDs" into oc-dev
am: ef3a28cb92

Change-Id: I0a5f11c0068a6da11bbb18d7a6f8e42f00655d74

commit | commitdiff | tree

Jason Monk [Mon, 3 Apr 2017 17:38:57 +0000 (17:38 +0000)]

Merge "Switch cast over to support library dialog" into oc-dev
am: de8cd0e8f5

Change-Id: I997130142d426967d60e9c384056c3aba1ea5af5

commit | commitdiff | tree

Jorim Jaggi [Mon, 3 Apr 2017 17:37:40 +0000 (17:37 +0000)]

Revert "Temporarily bg-whitelist the default container package-cleaning service"
am: 91232840aa

Change-Id: I0fefe67edea6e5a0c435bbe73730d5ede3adee14

commit | commitdiff | tree

Tony Mak [Mon, 3 Apr 2017 17:36:07 +0000 (17:36 +0000)]

Merge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev
am: 0c224f9674

Change-Id: I6dc643e93b2d542b407abd5aaa7d832df47e47f7

commit | commitdiff | tree

Hyunyoung Song [Mon, 3 Apr 2017 17:32:51 +0000 (17:32 +0000)]

Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev
am: 891e03203c

Change-Id: I14746f95c369503f5515e5123a481798fc76197c

commit | commitdiff | tree

Jeff Sharkey [Mon, 3 Apr 2017 17:29:45 +0000 (17:29 +0000)]

Merge "Lower-level user enumeration; fix disabled bug." into oc-dev
am: 713b7c6b53

Change-Id: Ic2edcfc0d30bc5429753c313d31703802e630851

commit | commitdiff | tree

Jeff Sharkey [Mon, 3 Apr 2017 17:27:48 +0000 (17:27 +0000)]

Merge "We really want f_frsize and f_bavail." into oc-dev
am: fd463121c6

Change-Id: I55aebb3b452f4d41af7e5f54d0dff27e9bc6cca6

commit | commitdiff | tree

Yin-Chia Yeh [Mon, 3 Apr 2017 17:24:40 +0000 (17:24 +0000)]

Merge "Camera: add batching support to HAL1 recording path" into oc-dev
am: e1df48d3a0

Change-Id: I8e43b2faf95002b33bd8b861b046cd15c02f38d3

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 16:43:02 +0000 (16:43 +0000)]

Merge "Expose instant app to exposed providers" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 16:37:44 +0000 (16:37 +0000)]

Merge "Disable sounds on menu button" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 16:37:07 +0000 (16:37 +0000)]

Merge "Fix battery icon dark initialization" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 16:34:12 +0000 (16:34 +0000)]

Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 15:57:34 +0000 (15:57 +0000)]

Merge "Fix broken perf tests" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 15:37:13 +0000 (15:37 +0000)]

Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 15:05:34 +0000 (15:05 +0000)]

Merge "Fix losing status bar icons on config changes" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 14:45:52 +0000 (14:45 +0000)]

Merge "Implement service filtering" into oc-dev

commit | commitdiff | tree

Bryce Lee [Mon, 3 Apr 2017 14:30:42 +0000 (14:30 +0000)]

Merge "Add app bounds to configuration." into oc-dev

commit | commitdiff | tree

Diego Perez [Mon, 27 Mar 2017 15:49:17 +0000 (16:49 +0100)]

Fix broken perf tests

Do not dispose Bridge on tearDown. The concept of disposing the Bridge
only made sense when we were loading it dynamically. Some classes have
static initializers that will fail after the dispose (like Typeface).

Test: N/A
Change-Id: I9c934432232bda02a4d26425587096fb6dc957b0
(cherry picked from commit f1532e36e16e2b55f175a24f11df91cf344833ff)

commit | commitdiff | tree

Chris Wren [Mon, 3 Apr 2017 13:42:38 +0000 (13:42 +0000)]

Merge "standardize network policy notification IDs" into oc-dev

commit | commitdiff | tree

Jason Monk [Mon, 3 Apr 2017 13:34:13 +0000 (13:34 +0000)]

Merge "Switch cast over to support library dialog" into oc-dev

commit | commitdiff | tree

Jorim Jaggi [Mon, 3 Apr 2017 12:40:39 +0000 (14:40 +0200)]

Revert "Temporarily bg-whitelist the default container package-cleaning service"

Causes bootloop.

This reverts commit f16e7423c79c4ccccf43265a5b1966eb8e7f7be7.

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 11:06:53 +0000 (11:06 +0000)]

Merge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev

commit | commitdiff | tree

Lorenzo Colitti [Mon, 3 Apr 2017 10:59:17 +0000 (10:59 +0000)]

Merge "Add test coverage for NetworkSpecifiers." am: 9a029b5262 am: 0e068f6360
am: 8ee38521bc

Change-Id: Ia7d36096f0e3f0b203d1d838043c03fcd1cea829

commit | commitdiff | tree

Lorenzo Colitti [Mon, 3 Apr 2017 10:52:20 +0000 (10:52 +0000)]

Merge "Add test coverage for NetworkSpecifiers." am: 9a029b5262
am: 0e068f6360

Change-Id: I376b9011aaae7f0b8a2899a942d1a43e26605101

commit | commitdiff | tree

Lorenzo Colitti [Mon, 3 Apr 2017 10:45:22 +0000 (10:45 +0000)]

Merge "Add test coverage for NetworkSpecifiers."
am: 9a029b5262

Change-Id: Ia328b945af4c4f55ef560b33b00fa861b8f81b0d

commit | commitdiff | tree

Treehugger Robot [Mon, 3 Apr 2017 10:37:00 +0000 (10:37 +0000)]

Merge "Add test coverage for NetworkSpecifiers."

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 09:52:13 +0000 (09:52 +0000)]

Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev

commit | commitdiff | tree

Hugo Benichi [Mon, 3 Apr 2017 09:17:18 +0000 (09:17 +0000)]

Merge "ConnectivityService: simplify WakeLock management" am: c98db5caa2 am: 6db00a22b0
am: 56ca1705d6

Change-Id: Iacc2e977c1eec2ebc9deb9395e1f77a62b57f070

commit | commitdiff | tree

Hugo Benichi [Mon, 3 Apr 2017 09:10:44 +0000 (09:10 +0000)]

Merge "ConnectivityService: simplify WakeLock management" am: c98db5caa2
am: 6db00a22b0

Change-Id: I468e31800d5cfe1dd385d773fcc393b615cfa343

commit | commitdiff | tree

Hugo Benichi [Mon, 3 Apr 2017 09:03:13 +0000 (09:03 +0000)]

Merge "ConnectivityService: simplify WakeLock management"
am: c98db5caa2

Change-Id: I1e0ae930cd7a329febf21ff3fc83ad2d0a3be69b

commit | commitdiff | tree

Hugo Benichi [Mon, 3 Apr 2017 08:56:23 +0000 (08:56 +0000)]

Merge "ConnectivityService: simplify WakeLock management"

commit | commitdiff | tree

Lorenzo Colitti [Mon, 3 Apr 2017 08:46:35 +0000 (17:46 +0900)]

Add test coverage for NetworkSpecifiers.

Tests various combinations of empty / non-empty NetworkSpecifiers
and changing specifiers on the fly.

Test: ConnectivityServiceTest passes
Bug: 27533960
Change-Id: Ibd6b4efc861dc51689e46f3882ba859223411bf0

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 08:36:04 +0000 (08:36 +0000)]

Merge "Lower-level user enumeration; fix disabled bug." into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 07:37:44 +0000 (07:37 +0000)]

Merge "We really want f_frsize and f_bavail." into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 07:34:01 +0000 (07:34 +0000)]

Merge "Camera: add batching support to HAL1 recording path" into oc-dev

commit | commitdiff | tree

Hyunyoung Song [Mon, 3 Apr 2017 07:23:49 +0000 (00:23 -0700)]

Prevent NPE when draw is called without bounds being set
Test: unit test inside AdaptiveIconDrawableTest.java

Change-Id: Ic3260ce9c6bae595c7eba7be1cd7ae249939a1cf

commit | commitdiff | tree

Daichi Hirono [Mon, 3 Apr 2017 07:00:35 +0000 (07:00 +0000)]

Merge "Process FuseAppLoop messages in Handler.Callback" into oc-dev
am: cb9ceb3fd4

Change-Id: I8708c1e60300c5384071106d9b3f75a534d1fbf6

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 06:54:59 +0000 (06:54 +0000)]

Merge "Process FuseAppLoop messages in Handler.Callback" into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 3 Apr 2017 06:19:57 +0000 (06:19 +0000)]

Enforce PACKAGE_USAGE_STATS for usage data.
am: 6df866a851

Change-Id: I52d982ee864903ca93e889aa03f6315438dc6c4b

commit | commitdiff | tree

Jeff Sharkey [Mon, 3 Apr 2017 06:19:02 +0000 (06:19 +0000)]

Consistent dump() permission checking.
am: fe9a53bc45

Change-Id: I300f8bc07e1266b9e78f56d085cd458862176a85

commit | commitdiff | tree

Jeff Sharkey [Mon, 3 Apr 2017 05:42:17 +0000 (23:42 -0600)]

Lower-level user enumeration; fix disabled bug.

UserManager may not have been started yet, so discover users by
looking at filesystem.

Fix disabled bug where default should be "false."

Test: builds, boots
Bug: 36794413
Change-Id: If91fd27b955175072228a93aab4b8ac3b27df0bf

commit | commitdiff | tree

Jeff Sharkey [Mon, 3 Apr 2017 05:24:40 +0000 (23:24 -0600)]

We really want f_frsize and f_bavail.

It's confusing, but f_bsize is not the value you're looking for; the
real block size is f_frsize. Fix all those bugs.

Also, the vast majority of clients are interested in the usable
disk space, not including reserved space.

Test: builds, boots
Bug: 36840579
Change-Id: Ib1470389afd49c14cab62282ec1e978ebb2c4791

commit | commitdiff | tree

Daichi Hirono [Mon, 3 Apr 2017 04:18:40 +0000 (13:18 +0900)]

Process FuseAppLoop messages in Handler.Callback

Previously FuseAppLoop instantiates Runnable for each command, which
causes lots of instantiation and GC.

Test: CTS
Bug: 35229514
Change-Id: Ifea098e5ade044b1a954c0b714c5b3270a95cd1a

commit | commitdiff | tree

Jeff Sharkey [Fri, 31 Mar 2017 20:08:23 +0000 (14:08 -0600)]

Enforce PACKAGE_USAGE_STATS for usage data.

Some system services are offering package usage data through both
public/system APIs and through dump() calls. In principle, usage
data hould always be protected with PACKAGE_USAGE_STATS, so start
enforcing that. (Otherwise if a user blocked PACKAGE_USAGE_STATS
access to an app, that app could still obtain the data via dump()
if they held the DUMP permission.)

Bottom line, let's respect the user's wishes.

Protecting the entire output like this is pretty blunt, but future
CLs can add more nuance to the output if desired.

Test: cts-tradefed run commandAndExit cts-dev -m CtsSecurityTestCases -t android.security.cts.ServicePermissionsTest
Bug: 32806790
Change-Id: I46173562713bea7d89e12a4313c78eb52ea8d77d

commit | commitdiff | tree

Jeff Sharkey [Fri, 31 Mar 2017 20:08:23 +0000 (14:08 -0600)]

Consistent dump() permission checking.

This change introduces new methods on DumpUtils that can check if the
caller has DUMP and/or PACKAGE_USAGE_STATS access. It then moves all
existing dump() methods to use these checks so that we emit
consistent error messages.

Test: cts-tradefed run commandAndExit cts-dev -m CtsSecurityTestCases -t android.security.cts.ServicePermissionsTest
Bug: 32806790
Change-Id: Iaff6b9506818ee082b1e169c89ebe1001b3bfeca

commit | commitdiff | tree

Bill Yi [Mon, 3 Apr 2017 02:25:51 +0000 (02:25 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 8f59f867f9 -s ours
am: 14f8818989 -s ours

Change-Id: I6e42ae3f5cf5a704b1f3c350af378bd178ac6714

commit | commitdiff | tree

Bill Yi [Mon, 3 Apr 2017 02:18:48 +0000 (02:18 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 8f59f867f9 -s ours

Change-Id: Ief3fa9c34e3a1959e193d35cea0b0ace7168411e

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 02:11:39 +0000 (02:11 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Roozbeh Pournader [Mon, 3 Apr 2017 00:27:42 +0000 (00:27 +0000)]

Merge "Override bidi property of new emojis" into oc-dev
am: 21a5edcc24

Change-Id: Ie37451b8234f1e5c06bb20f1c26e8f832006f3e3

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 00:21:50 +0000 (00:21 +0000)]

Merge "Override bidi property of new emojis" into oc-dev

commit | commitdiff | tree

Hugo Benichi [Mon, 3 Apr 2017 00:00:19 +0000 (00:00 +0000)]

Merge "ConnectivityService: log wakelock activity in dumps" am: db104b2367 am: 146914c0d5
am: bf1b181c63

Change-Id: Id4c980a2a1ef7f51b6a06c7c8636160437e99b84

commit | commitdiff | tree

Hugo Benichi [Thu, 30 Mar 2017 14:18:10 +0000 (23:18 +0900)]

ConnectivityService: simplify WakeLock management

This patch simplifies wakelock management by acknowledging that only one
acquisition at most is in flight at any time. This allows to remove the
serial number associated with wakelock acquisition and to avoid double
release when regaining a default network.

Example of $ adb shell dumpsys connectivity logs:
  NetTransition WakeLock activity (most recent first):
    03-31 00:15:13.816 - RELEASE (EVENT_CLEAR_NET_TRANSITION_WAKELOCK)
    03-31 00:14:59.216 - ACQUIRE for NetworkAgentInfo [WIFI () - 101]
    03-31 00:09:05.799 - RELEASE (EVENT_EXPIRE_NET_TRANSITION_WAKELOCK)
    03-31 00:08:05.738 - ACQUIRE for NetworkAgentInfo [WIFI () - 100]

Test: watched wakelock section $ adb shell dumpsys connectivity while
      turning on and off Wifi (with no other network).
Bug: 36703718
Change-Id: I899b0816c0e41b3991d9540e9b9a604914ff673a

commit | commitdiff | tree

Hugo Benichi [Sun, 2 Apr 2017 23:53:46 +0000 (23:53 +0000)]

Merge "ConnectivityService: log wakelock activity in dumps" am: db104b2367
am: 146914c0d5

Change-Id: I4d0430a6a5b3a1f97cdc4cf9590e5b0a798ae04f

commit | commitdiff | tree

Hugo Benichi [Sun, 2 Apr 2017 23:47:15 +0000 (23:47 +0000)]

Merge "ConnectivityService: log wakelock activity in dumps"
am: db104b2367

Change-Id: If08e0088ab25f1494aaf3a339a38e7a8e343d910

commit | commitdiff | tree

Hugo Benichi [Sun, 2 Apr 2017 23:40:25 +0000 (23:40 +0000)]

Merge "ConnectivityService: log wakelock activity in dumps"

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:17:29 +0000 (09:17 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2c697884a3 -s ours
am: d6cbc60edc -s ours

Change-Id: I6d4593dd6e87a4da1518ee4ef397b3872c58660e

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:16:19 +0000 (09:16 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: bcd194eb04 -s ours
am: 4448f63145 -s ours

Change-Id: I44a2fcad7ce27350d110263ce2083b489bb47762

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:15:09 +0000 (09:15 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1058478d5b -s ours
am: c29576d8ab -s ours

Change-Id: I6be632590f27cfa2beefe42b4fb597a76a479cb1

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:13:59 +0000 (09:13 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 69dd99c741 -s ours
am: 932a818776 -s ours

Change-Id: I69cc4dc851739b9d09bd82790c0a9202922a5a28

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:12:51 +0000 (09:12 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e1a2ddeee8 -s ours
am: 11a1d54f70 -s ours

Change-Id: Ifd5eccfa888ab90d240fe7a56adbb6dd12cfc7f5

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:07:28 +0000 (09:07 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 45d02673c5 -s ours
am: 6139220455 -s ours

Change-Id: Idfb1bf95e80395e1739a63843a09ea6a37287dbf

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:06:23 +0000 (09:06 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 2c697884a3 -s ours

Change-Id: I2e43884e9fda71b912361b12c5d26873ccd92953

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:06:15 +0000 (09:06 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ae1e284380 -s ours
am: d81d46b334 -s ours

Change-Id: Ifb3d5693ccd59babe6855ce13ce018e489cb9f89

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:05:11 +0000 (09:05 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: bcd194eb04 -s ours

Change-Id: Ide3209a7be2b5f32cced831c4bfb0f4ae8e1b278

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:05:04 +0000 (09:05 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0bbfc26ecb -s ours
am: f83dc01d39 -s ours

Change-Id: Ibd10986f74a2da231ebb892985e2fba6fecf6312

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:04:04 +0000 (09:04 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 1058478d5b -s ours

Change-Id: Ie6758133479cfb44940dc63719595362d407c61e

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:02:57 +0000 (09:02 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 69dd99c741 -s ours

Change-Id: I1eb25a2afadf68bd8a44195debb4846bca36d193

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:01:34 +0000 (09:01 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: e1a2ddeee8 -s ours

Change-Id: Ic3d74dd044e7da852eeea96744c209d3741a00d5

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:00:22 +0000 (09:00 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 45d02673c5 -s ours

Change-Id: I251062605b0d0a5ea912a510cac39ab6326f6496

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:59:14 +0000 (08:59 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f13c6c2a4c -s ours
am: 4fd00b9756 -s ours

Change-Id: Ia7246f6e66ba1e7931aa7dd88f65408e9c3973f8

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:59:11 +0000 (08:59 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: ae1e284380 -s ours

Change-Id: Ibb55ea97617f1b4cff17fe66f1ff6bc1b185e4e4

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:58:03 +0000 (08:58 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 89a5b41395 -s ours
am: bb625889e4 -s ours

Change-Id: I0f9a0ed253b77f134522533f5589ba053584888e

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:57:59 +0000 (08:57 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 0bbfc26ecb -s ours

Change-Id: I8e14e844175e9d54e1249756a03b4470226a4d39

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:54:42 +0000 (08:54 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4bac557350 -s ours
am: afb631bbd3 -s ours

Change-Id: Ia69bc259d19b21b2099c6e239a93f2b64e72b626

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:54:36 +0000 (08:54 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: f13c6c2a4c -s ours

Change-Id: Ic6c474944a6a0a6b0a1a301f3ccd4a8e891ff073

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:53:21 +0000 (08:53 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 68a2d1d674 -s ours
am: 4bdc34e8d7 -s ours

Change-Id: If26b5c46f00ed9e862652692e3206184c32e8989

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:53:18 +0000 (08:53 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 89a5b41395 -s ours

Change-Id: I83d95004dbb353c6b6657091845ea02358ce10bb

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:47:56 +0000 (08:47 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 4bac557350 -s ours

Change-Id: Id582294a639c1037f1f87b4f04ae2d79061e5e57

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:47:36 +0000 (08:47 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:46:47 +0000 (08:46 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 68a2d1d674 -s ours

Change-Id: I215a2d1fdcb8654739221d9b00457c9584728e17