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

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

Winson Chung [Mon, 1 May 2017 18:24:43 +0000 (18:24 +0000)]

Merge "Ensure that the action views are always updated." into oc-dev am: f8e7cbffb9
am: 8c11b89baf

Change-Id: I775435bcf1de8ad6a36cbb407d6eb293cb0b76bc

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 18:22:23 +0000 (18:22 +0000)]

Merge "Change String to CharSequence in #loadSummary." into oc-dev am: 63827ce61b
am: f0d14afa61

Change-Id: Ib99d458b6f14dba8c3a62a14fb2d845feea611c4

commit | commitdiff | tree

Winson Chung [Mon, 1 May 2017 18:16:42 +0000 (18:16 +0000)]

Merge "Fix issue with double tapping PiP" into oc-dev am: 33d95164ab
am: f15f678cea

Change-Id: If99b06b060e80c4b05ccc02201a69f2f0d07df5b

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 18:14:46 +0000 (18:14 +0000)]

Merge "Removing unnecessary asset." into oc-dev am: 45eed80587
am: edf5315427

Change-Id: I4769972939781b65585d5017aa1ff0b5b6cad04d

commit | commitdiff | tree

Winson Chung [Mon, 1 May 2017 18:13:19 +0000 (18:13 +0000)]

Merge "Ensure that the action views are always updated." into oc-dev
am: f8e7cbffb9

Change-Id: I00b603c3bcc4da09d95e1feb8d80bac2626b6b26

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 18:10:36 +0000 (18:10 +0000)]

Merge "Change String to CharSequence in #loadSummary." into oc-dev
am: 63827ce61b

Change-Id: Ic7a72161a671de50ade75e670e269523dd78f7fe

commit | commitdiff | tree

Winson Chung [Mon, 1 May 2017 18:08:15 +0000 (18:08 +0000)]

Merge "Fix issue with double tapping PiP" into oc-dev
am: 33d95164ab

Change-Id: I34edd358a3d44e58fbf80661d14d541fcb275de2

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 18:06:24 +0000 (18:06 +0000)]

Merge "Removing unnecessary asset." into oc-dev
am: 45eed80587

Change-Id: I52336e75ff507b186ba74b4e5b25ac796fe6dd07

commit | commitdiff | tree

Martijn Coenen [Mon, 1 May 2017 18:03:47 +0000 (18:03 +0000)]

Merge "Increase max system_server hwbinder threadpool to 5." into oc-dev am: e14513c787
am: b18823d437

Change-Id: I7567f23415110a7f63bc5504d57ad000bfbb23f9

commit | commitdiff | tree

Martijn Coenen [Mon, 1 May 2017 17:56:33 +0000 (17:56 +0000)]

Merge "Increase max system_server hwbinder threadpool to 5." into oc-dev
am: e14513c787

Change-Id: Ic56ac41fcb853d142be472a87541b0b4bb132ff5

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 May 2017 17:56:08 +0000 (17:56 +0000)]

Merge "Ensure that the action views are always updated." into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 17:52:22 +0000 (17:52 +0000)]

Merge "Change String to CharSequence in #loadSummary." into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 May 2017 17:50:37 +0000 (17:50 +0000)]

Merge "Fix issue with double tapping PiP" into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 17:48:24 +0000 (17:48 +0000)]

Merge "Removing unnecessary asset." into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 May 2017 17:47:00 +0000 (17:47 +0000)]

Merge "Increase max system_server hwbinder threadpool to 5." into oc-dev

commit | commitdiff | tree

Chris Craik [Mon, 1 May 2017 17:40:43 +0000 (17:40 +0000)]

Merge "Move ColorSpace#Renderer tests to APCT" into oc-dev am: 117ce083bf
am: b55bb70897

Change-Id: I27b17d395ae02fd9fe00c7aaf0ecc5f93cdaceb2

commit | commitdiff | tree

Chris Craik [Mon, 1 May 2017 17:34:59 +0000 (17:34 +0000)]

Merge "Move ColorSpace#Renderer tests to APCT" into oc-dev
am: 117ce083bf

Change-Id: I86a5aec02da2012542fc6b9cbb5bab83d0ca9bf6

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 17:34:55 +0000 (17:34 +0000)]

Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." into oc-dev am: e24457409e
am: 9930a35e44

Change-Id: I75d43755aa93fc370fe2c7ff37ec89c4f689eb3b

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 17:27:32 +0000 (17:27 +0000)]

Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." into oc-dev
am: e24457409e

Change-Id: I5998fd5c20c43a3a5595919abc4c77a0715ab044

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 May 2017 17:23:50 +0000 (17:23 +0000)]

Merge "Move ColorSpace#Renderer tests to APCT" into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 17:19:26 +0000 (17:19 +0000)]

Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." into oc-dev

commit | commitdiff | tree

Salvador Martinez [Mon, 1 May 2017 17:01:13 +0000 (17:01 +0000)]

Merge "Added dialog to notify user of thermal shutdown" into oc-dev am: 4d09adcef1
am: ba1cc4bb42

Change-Id: I6d0a0c6dc87bac1470eb4cfccee61c878bed9ee3

commit | commitdiff | tree

Salvador Martinez [Mon, 1 May 2017 16:55:44 +0000 (16:55 +0000)]

Merge "Added dialog to notify user of thermal shutdown" into oc-dev
am: 4d09adcef1

Change-Id: Ic53481e2aa95146bc33c21174b1a50f62bdc8851

commit | commitdiff | tree

Matthew Snider [Mon, 1 May 2017 16:55:39 +0000 (16:55 +0000)]

Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev am: ef08871d6b
am: fa88787309

Change-Id: Icf3f61c961fcd2684c9b32edd5617f0514445c7d

commit | commitdiff | tree

Matthew Snider [Mon, 1 May 2017 16:46:17 +0000 (16:46 +0000)]

Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev
am: ef08871d6b

Change-Id: Ib173b22981d9081c184b024d54671729ec081d11

commit | commitdiff | tree

Salvador Martinez [Mon, 1 May 2017 16:45:25 +0000 (16:45 +0000)]

Merge "Added dialog to notify user of thermal shutdown" into oc-dev

commit | commitdiff | tree

Matthew Snider [Mon, 1 May 2017 16:42:19 +0000 (16:42 +0000)]

Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 16:19:39 +0000 (16:19 +0000)]

Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class." into oc-dev am: 080e16575a
am: f89879a133

Change-Id: Iac4f73f0c20ce3b95d406d487a5ed2f8ed391033

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 16:11:00 +0000 (16:11 +0000)]

Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class." into oc-dev
am: 080e16575a

Change-Id: I8e81a2f5361d2fc6ab61cb38f69fe1e0eb867e63

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 16:05:26 +0000 (16:05 +0000)]

Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class." into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 15:54:28 +0000 (15:54 +0000)]

Merge "Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI" into oc-dev am: 1c9e549c00
am: a70ba223b3

Change-Id: Ib0d10d38e7454cc4ee94b9195d81b6a49a56b94a

commit | commitdiff | tree

Winson Chung [Fri, 28 Apr 2017 20:07:46 +0000 (13:07 -0700)]

Removing unnecessary asset.

Bug: 37743450
Test: None, just removing asset
Change-Id: Icbf8c2fd08b3f0ad52ced3dcd8766cd9d055d5fb

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 15:45:32 +0000 (15:45 +0000)]

Merge "Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI" into oc-dev
am: 1c9e549c00

Change-Id: I22e49d7404e21917d5e805424cecd2fad50d1aa4

commit | commitdiff | tree

Colin Cross [Mon, 1 May 2017 15:45:10 +0000 (15:45 +0000)]

Add missing symbol am: 316c9ce694 -s ours
am: 7ae8dd91e7

Change-Id: I8e2404d11dafae1113600f2bbcbd08007d8f004a

commit | commitdiff | tree

Colin Cross [Mon, 1 May 2017 15:38:11 +0000 (15:38 +0000)]

Add missing symbol
am: 316c9ce694 -s ours

Change-Id: I6c8785a409b67e819100747267b1b113d35a4eda

commit | commitdiff | tree

Jeff Sharkey [Mon, 1 May 2017 15:37:12 +0000 (15:37 +0000)]

Merge "Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI" into oc-dev

commit | commitdiff | tree

Colin Cross [Mon, 1 May 2017 01:33:25 +0000 (18:33 -0700)]

Add missing symbol

Bug: 35998031
Test: builds
Change-Id: Ie085b4058c5714df9913ceb9fd03fb4658168520

commit | commitdiff | tree

Jason Monk [Mon, 1 May 2017 13:39:34 +0000 (13:39 +0000)]

Merge "Fix flaky test?" into oc-dev am: 030107f0bd
am: 16c981ea43

Change-Id: I7162f1b25b97c2f89c45103a6c7b2cf290fc38cd

commit | commitdiff | tree

Jason Monk [Mon, 1 May 2017 13:31:26 +0000 (13:31 +0000)]

Merge "Fix flaky test?" into oc-dev
am: 030107f0bd

Change-Id: I3ae44198c1f15967b8a774a5166c678c0be0ab47

commit | commitdiff | tree

Jason Monk [Mon, 1 May 2017 13:23:17 +0000 (13:23 +0000)]

Merge "Fix flaky test?" into oc-dev

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 1 May 2017 06:49:06 +0000 (06:49 +0000)]

Merge "AudioFocusRequest: more docs, listener without handler" into oc-dev am: 128f8aa8e3
am: 5642a6559b

Change-Id: I37a1a943406ec2384bc403f70b790a56f0fd00d0

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 1 May 2017 06:41:30 +0000 (06:41 +0000)]

Merge "AudioFocusRequest: more docs, listener without handler" into oc-dev
am: 128f8aa8e3

Change-Id: If1ef13a45277b91589b292d8e88af539ee720d03

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 1 May 2017 06:33:01 +0000 (06:33 +0000)]

Merge "AudioFocusRequest: more docs, listener without handler" into oc-dev

commit | commitdiff | tree

Karthik Ravi Shankar [Fri, 28 Apr 2017 18:21:04 +0000 (11:21 -0700)]

Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI

android.permission.RESTRICTED_VR_ACCESS is currently an open API. But
since it can only be used by System Apps because of it's protection
level which is "signature|preinstalled". Change this to a @SystemApi.

Bug: 37724255
Test: run gts --module GtsPermissionTestCases
1. Run with two apps having android.permission.RESTRICTED_VR_ACCESS
before change -- fails.
2. Run with two appshaving android.permission.RESTRICTED_VR_ACCESS
after this change -- passes.

Change-Id: I9e640b0794fa16d03ba22e8aa75175e7e08dd88b
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 1 May 2017 01:49:36 +0000 (18:49 -0700)]

AudioFocusRequest: more docs, listener without handler

Focus listener: follow platform pattern for setter of listener
and handler (set(listener) and set(listener, handler) methods).
More docs.

Test: cts-tradefed run cts -m CtsMediaTestCases -t android.media.cts.AudioFocusTest
Bug: 30258418

Change-Id: Ib5d1fbc3cf92821b63ffc1b4ad4cf4384bb6ff54

commit | commitdiff | tree

Rebecca Silberstein [Sun, 30 Apr 2017 22:18:03 +0000 (22:18 +0000)]

Merge "Revert "WifiManager: expose Local Only Hotspot APIs"" into oc-dev am: ad4c31fecf
am: 0e2ddda971

Change-Id: I96fd38468deb7b86ab3e0a055802aa73e9447c02

commit | commitdiff | tree

Rebecca Silberstein [Sun, 30 Apr 2017 22:00:55 +0000 (22:00 +0000)]

Merge "Revert "WifiManager: expose Local Only Hotspot APIs"" into oc-dev
am: ad4c31fecf

Change-Id: I6aa5630a46e067230b1368f8c119aebaf18bd1d2

commit | commitdiff | tree

Rebecca Silberstein [Sun, 30 Apr 2017 21:54:43 +0000 (21:54 +0000)]

Merge "Revert "WifiManager: expose Local Only Hotspot APIs"" into oc-dev

commit | commitdiff | tree

Rebecca Silberstein [Sun, 30 Apr 2017 20:02:59 +0000 (20:02 +0000)]

Revert "WifiManager: expose Local Only Hotspot APIs"

This reverts commit ec18f81e5b8bc4e4486b00f37e68cff4ff9131eb.

Reverting the CL to expose the APIs so we have more time for testing
and ironing out the API.

Bug: 31466854
Bug: 37073685
Test: make update-api
Test: make
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I17d4e3e32e28dbbb08ba99c266a9b74044e6001d

commit | commitdiff | tree

Rebecca Silberstein [Sun, 30 Apr 2017 18:45:31 +0000 (18:45 +0000)]

Merge changes I8d149ab0,Ia0a52819,If54a89cb,I20faa733,Ib32dfd23 into oc-dev am: 07ea44909f
am: 63ca3e2414

Change-Id: Ieb34996878d9689e2bd29590a302a95dd7d2d83c

commit | commitdiff | tree

Rebecca Silberstein [Sun, 30 Apr 2017 18:38:19 +0000 (18:38 +0000)]

Merge changes I8d149ab0,Ia0a52819,If54a89cb,I20faa733,Ib32dfd23 into oc-dev
am: 07ea44909f

Change-Id: Ia3164a0c4438cb025601f62b097f83f77a69358f

commit | commitdiff | tree

Rebecca Silberstein [Sun, 30 Apr 2017 18:30:43 +0000 (18:30 +0000)]

Merge changes I8d149ab0,Ia0a52819,If54a89cb,I20faa733,Ib32dfd23 into oc-dev

* changes:
  WifiManager: expose Local Only Hotspot APIs
  WifiManager: implement watch LocalOnlyHotspot
  WifiManager: implement start/stopLocalOnlyHotspot
  WifiManager: add LocalOnlyHotspotObserverProxy
  WifiManager: add LocalOnlyHotspotCallbackProxy

commit | commitdiff | tree

Dianne Hackborn [Sun, 30 Apr 2017 17:44:10 +0000 (17:44 +0000)]

Merge "Work on issue #36891897: Need to ensure foreground services can't..." into oc-dev am: f1a4b50739
am: a766f1d1ec

Change-Id: I82c6b62af3d4eddbd4e97c83b2bb7d4a1657c63d

commit | commitdiff | tree

Abodunrinwa Toki [Sun, 30 Apr 2017 17:36:38 +0000 (17:36 +0000)]

Merge "TextClassifier: API rename" into oc-dev am: 093eb12994
am: 7acf27c9be

Change-Id: Iab9dd6b5bc8fdcb8cbe1150748dfc67fcc304bf8

commit | commitdiff | tree

Dianne Hackborn [Sun, 30 Apr 2017 17:34:21 +0000 (17:34 +0000)]

Merge "Work on issue #36891897: Need to ensure foreground services can't..." into oc-dev
am: f1a4b50739

Change-Id: I242303b9dc50a8a69525d26a41cec6c09e361d17

commit | commitdiff | tree

Abodunrinwa Toki [Sun, 30 Apr 2017 17:26:55 +0000 (17:26 +0000)]

Merge "TextClassifier: API rename" into oc-dev
am: 093eb12994

Change-Id: Idc047d0aa3a9dea72c703d83e4caf521166d9531

commit | commitdiff | tree

Dianne Hackborn [Sun, 30 Apr 2017 17:19:29 +0000 (17:19 +0000)]

Merge "Work on issue #36891897: Need to ensure foreground services can't..." into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 17:15:44 +0000 (17:15 +0000)]

Merge "TextClassifier: API rename" into oc-dev

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 16:21:28 +0000 (16:21 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: b212441814 -s ours
am: 5059b148d1 -s ours

Change-Id: Ie53d2063d7ea8a0c1e9e1a28ccaf6a71f53db994

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 16:14:26 +0000 (16:14 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: b212441814 -s ours

Change-Id: Ia7f4b06b6f60dcb432d7303f918753ffb5f2c81c

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 16:08:30 +0000 (16:08 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

Adam Lesinski [Sun, 30 Apr 2017 14:45:04 +0000 (14:45 +0000)]

Merge "AAPT2: Fix typo in manifest validation expectation" into oc-dev am: 7cf8ca95aa
am: f43dd4b032

Change-Id: I672916a11b83dea83ae9ea0048a4c22747b53733

commit | commitdiff | tree

Adam Lesinski [Sun, 30 Apr 2017 14:38:28 +0000 (14:38 +0000)]

Merge "AAPT2: Fix typo in manifest validation expectation" into oc-dev
am: 7cf8ca95aa

Change-Id: I58d0fd8fa128b0c8773a9fd158ae4fd9c46cd748

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 14:31:12 +0000 (14:31 +0000)]

Merge "AAPT2: Fix typo in manifest validation expectation" into oc-dev

commit | commitdiff | tree

Martijn Coenen [Sun, 30 Apr 2017 14:01:00 +0000 (14:01 +0000)]

Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev am: 35312fd4c6
am: 23a0f58eea

Change-Id: I2b7aada5d0ec51c2a5513b15f6f855fd7cf5166c

commit | commitdiff | tree

Martijn Coenen [Sun, 30 Apr 2017 13:53:54 +0000 (13:53 +0000)]

Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev
am: 35312fd4c6

Change-Id: Ibab6c7a25fe9534bd1a274065b36dc7813f745e0

commit | commitdiff | tree

Martijn Coenen [Sun, 30 Apr 2017 13:47:06 +0000 (13:47 +0000)]

Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev

commit | commitdiff | tree

Rebecca Silberstein [Sun, 30 Apr 2017 10:11:03 +0000 (10:11 +0000)]

Merge "WifiManager: add APIs for LOHS" into oc-dev am: 4bac2d2fd7
am: e865c5e5e4

Change-Id: I5006309e5ba0c4c6dc16043f18b4c3c06914d845

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 10:08:22 +0000 (10:08 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: f1ec05297d -s ours
am: d65e3e848a -s ours

Change-Id: If7483545c49a9c4c08c44daab73a561246d20667

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 10:03:47 +0000 (10:03 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 8d9d1ae932 -s ours
am: 9d55911ac5 -s ours

Change-Id: I3ebb083c11d21211a6ca33c2f77578b37dceba0d

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 10:02:05 +0000 (10:02 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: f38b94a933 -s ours
am: f47a41368a -s ours

Change-Id: If88ea0b60f9f383195c5306476515e0126a3867a

commit | commitdiff | tree

Rebecca Silberstein [Sun, 30 Apr 2017 09:57:24 +0000 (09:57 +0000)]

Merge "WifiManager: add APIs for LOHS" into oc-dev
am: 4bac2d2fd7

Change-Id: I5867a29fa23701eba593b6e49464adbc1267186a

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 09:55:54 +0000 (09:55 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 5bb0b0b7e2 -s ours
am: 0f880e61bd -s ours

Change-Id: I4567fc8c2ea0d36ae54da016936f38c9b614e3cb

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 09:55:39 +0000 (09:55 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: f1ec05297d -s ours

Change-Id: I2d1e4c8f333d8e97e154ae999bf7e1d2cfca1cac

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 09:53:59 +0000 (09:53 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 8d9d1ae932 -s ours

Change-Id: I7dd0d63dbe81bdf253aa6a60a3c2a62082af4479

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 09:51:50 +0000 (09:51 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: f38b94a933 -s ours

Change-Id: Ieb184cb9223a86d2711c52f08bf1634ad5e2f759

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 09:45:50 +0000 (09:45 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 5bb0b0b7e2 -s ours

Change-Id: If3a6b958fa28dfc5f6486f1d2fc5e9018562f7b5

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 09:45:20 +0000 (09:45 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: c0c868e359 -s ours
am: 24ffb717a0 -s ours

Change-Id: I73c7832b07a9a5595d7b53bff3c2b251a40d7c24

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 09:43:19 +0000 (09:43 +0000)]

Merge "WifiManager: add APIs for LOHS" into oc-dev

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 09:42:59 +0000 (09:42 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: b9b01f5745 -s ours
am: 5629c64820 -s ours

Change-Id: I0c003fbd8710a416e58d2e6ba1fcdec61d01804f

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 09:40:24 +0000 (09:40 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 09:37:42 +0000 (09:37 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: c0c868e359 -s ours

Change-Id: Ib299c3c68c917bc1007ad4442a099b51451c3887

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 09:35:51 +0000 (09:35 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: b9b01f5745 -s ours

Change-Id: If172f04e68b9821171e2719be3f61d5f7dbd9f4c

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 09:35:07 +0000 (09:35 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 09:32:37 +0000 (09:32 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 5957e13822 -s ours
am: 506fcc3a9d -s ours

Change-Id: I04a0fcb0e52142c8e323f9d12514394d6c3f3b4c

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 09:31:52 +0000 (09:31 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 09:31:00 +0000 (09:31 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 572e338a4c -s ours
am: d8879e06fa -s ours

Change-Id: I5321072d0b7ff0df8061496559a0e520a84b4980

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 09:28:47 +0000 (09:28 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 09:24:26 +0000 (09:24 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

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

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 5957e13822 -s ours

Change-Id: Ia70fef566e22ef708c54f0eb32d1ef3103984ceb

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 09:23:33 +0000 (09:23 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev