OSDN Git Service
Chen Xu [Fri, 21 Apr 2017 21:38:43 +0000 (21:38 +0000)]
Merge "telephony service support notification channel" into oc-dev
am:
53d9e9d094
Change-Id: I51432b33bce1cd957d2c1a139513d913a3b2c178
Suprabh Shukla [Fri, 21 Apr 2017 21:31:45 +0000 (21:31 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
am:
f277ccbca6
Change-Id: I836447e93964519f930e0ab1f9c08cdab406e2d6
Makoto Onuki [Fri, 21 Apr 2017 21:29:07 +0000 (21:29 +0000)]
Merge "Add more log to track down the "idle until changed" issue." into oc-dev
am:
ba5c2d3e44
Change-Id: Ibf74cfc80511d6167c134d7e86e8e59921dc90c7
Chen Xu [Fri, 21 Apr 2017 21:26:26 +0000 (21:26 +0000)]
Merge "telephony service support notification channel" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 21:22:05 +0000 (21:22 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 21:20:24 +0000 (21:20 +0000)]
Merge "Add more log to track down the "idle until changed" issue." into oc-dev
Wei Jia [Fri, 21 Apr 2017 21:19:36 +0000 (21:19 +0000)]
Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev
am:
62a3aa745a
Change-Id: I09feef76ad0ea67eaebecb6a14494b4fcb33e1e8
TreeHugger Robot [Fri, 21 Apr 2017 21:10:47 +0000 (21:10 +0000)]
Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev
Eric Laurent [Fri, 21 Apr 2017 20:52:49 +0000 (20:52 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev
am:
910311b356
Change-Id: I13cbf5a51eaa884527f4df79fe215e4b012082e0
Jakub Pawlowski [Fri, 21 Apr 2017 20:50:07 +0000 (20:50 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf am:
e00b92e550
am:
b4be7093da
Change-Id: I712347c5e3ceaae00fd179e77d62311ef6bba89d
Jakub Pawlowski [Fri, 21 Apr 2017 20:43:55 +0000 (20:43 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf
am:
e00b92e550
Change-Id: I6805a973e91ac16cfc5d1c30567df04e7ed98ba2
TreeHugger Robot [Fri, 21 Apr 2017 20:43:45 +0000 (20:43 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev
Matthew Ng [Fri, 21 Apr 2017 20:39:21 +0000 (20:39 +0000)]
Merge "Increases the minimized width in landscape by statusbar height" into oc-dev
am:
e00febf61c
Change-Id: Icb24d1e3e2845544936268fbbb5d27b48681506d
Jakub Pawlowski [Fri, 21 Apr 2017 20:38:00 +0000 (20:38 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
am:
c8d5f84fcf
Change-Id: Ieec563c19e318e6ffc0716009d554a11ff9f4847
TreeHugger Robot [Fri, 21 Apr 2017 20:30:46 +0000 (20:30 +0000)]
Merge "Increases the minimized width in landscape by statusbar height" into oc-dev
Jakub Pawlowski [Fri, 21 Apr 2017 20:28:44 +0000 (20:28 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
Jakub Pawlowski [Fri, 21 Apr 2017 11:59:55 +0000 (04:59 -0700)]
Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug:
37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
Jeff Sharkey [Fri, 21 Apr 2017 20:26:59 +0000 (20:26 +0000)]
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
am:
0a02259bba
Change-Id: I10256e0e19e07f0636561a202cd5a5f38a59047f
TreeHugger Robot [Fri, 21 Apr 2017 20:20:03 +0000 (20:20 +0000)]
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
Jeff Sharkey [Fri, 21 Apr 2017 20:10:50 +0000 (20:10 +0000)]
Merge "Fix code accounting bugs, track external app data." into oc-dev
am:
4b32f7c676
Change-Id: Ie14bf66fd93d6c461983a5232d4164c815cb56b7
Jeff Sharkey [Fri, 21 Apr 2017 20:01:36 +0000 (20:01 +0000)]
Merge "Fix code accounting bugs, track external app data." into oc-dev
Lucas Dupin [Fri, 21 Apr 2017 19:44:14 +0000 (19:44 +0000)]
Merge "Add transfer mode support to ColorDrawable" into oc-dev
am:
eedceb5721
Change-Id: If27a7e4154dabbeffd2b11ee2b788c9e30b3d9a7
Craig Donner [Fri, 21 Apr 2017 19:40:01 +0000 (19:40 +0000)]
Merge "Update HardwareBuffer API." into oc-dev
am:
649040c7f6
Change-Id: I49687761d304075acc048afa2e97e4b0b9b84680
Dianne Hackborn [Fri, 21 Apr 2017 19:32:27 +0000 (19:32 +0000)]
Merge "Fix issue #
32180780: Sync adapters inappropriately being run..." into oc-dev
am:
0fa2574ecb
Change-Id: I7ea8132d0dcda44c25d1d96a1ce4f52f6cb0e72c
Makoto Onuki [Fri, 21 Apr 2017 19:21:25 +0000 (12:21 -0700)]
Add more log to track down the "idle until changed" issue.
Bug
34724174
Test: Tested manually with intentionally adding a bug.
Change-Id: I1789285068203b22ce271180667eb9cb1eb0b182
TreeHugger Robot [Fri, 21 Apr 2017 19:29:03 +0000 (19:29 +0000)]
Merge "Add transfer mode support to ColorDrawable" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 19:28:24 +0000 (19:28 +0000)]
Merge "Update HardwareBuffer API." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 19:23:06 +0000 (19:23 +0000)]
Merge "Fix issue #
32180780: Sync adapters inappropriately being run..." into oc-dev
Philip P. Moltmann [Fri, 21 Apr 2017 19:01:28 +0000 (19:01 +0000)]
Merge "Fine tune the Autofill Save UI" into oc-dev
am:
ede054a73e
Change-Id: I0f23b28dbb8da1a3182411223bb3edde09fb56d8
Wale Ogunwale [Fri, 21 Apr 2017 18:58:59 +0000 (18:58 +0000)]
Merge "Switched wtf in DimLayerController to warning instead" into oc-dev
am:
d0c3b9c685
Change-Id: Ia75c5e478341cac25a7783ee058edd89bd05e7e8
TreeHugger Robot [Fri, 21 Apr 2017 18:53:15 +0000 (18:53 +0000)]
Merge "Fine tune the Autofill Save UI" into oc-dev
Jesse Hall [Fri, 21 Apr 2017 18:52:54 +0000 (18:52 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev
am:
489edb395b
Change-Id: Ib258e8485a3bcafef4ec65f4b28caaaeb081189e
Wale Ogunwale [Fri, 21 Apr 2017 18:52:41 +0000 (18:52 +0000)]
Merge "Switched wtf in DimLayerController to warning instead" into oc-dev
Android Build Merger (Role) [Fri, 21 Apr 2017 18:47:06 +0000 (18:47 +0000)]
Merge "Merge "Use SubscriptionId instead of SubId" am:
946410eef5 am:
9cad054e02 am:
fb0acf3355" into oc-dev-plus-aosp
Jordan Liu [Fri, 21 Apr 2017 18:45:36 +0000 (18:45 +0000)]
Merge "Use SubscriptionId instead of SubId" am:
946410eef5 am:
9cad054e02
am:
fb0acf3355
Change-Id: I81365ed8a767f4571a62da0ff0ba170badcce462
Joe Fernandez [Fri, 21 Apr 2017 18:44:57 +0000 (18:44 +0000)]
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
am:
62a24e9493
Change-Id: I480054acc8be3934bb7ad25cc932da380fab5d02
Joe Fernandez [Fri, 21 Apr 2017 18:42:54 +0000 (18:42 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev
am:
28973b3817
Change-Id: I9bdc0c10f3046f0d6f1c1abe0a8977379121d6b4
TreeHugger Robot [Fri, 21 Apr 2017 18:38:19 +0000 (18:38 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:36:46 +0000 (18:36 +0000)]
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:34:08 +0000 (18:34 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev
fionaxu [Thu, 20 Apr 2017 00:43:48 +0000 (17:43 -0700)]
telephony service support notification channel
Bug:
37475310
Test: Manual
Change-Id: I662d2d29cfb9a0ba47ae25de2332a906bb50ff85
Jordan Liu [Fri, 21 Apr 2017 18:30:29 +0000 (18:30 +0000)]
Merge "Use SubscriptionId instead of SubId" am:
946410eef5
am:
9cad054e02
Change-Id: Ib57abfadda3521667ce788e37e77496300feef4e
Jordan Liu [Fri, 21 Apr 2017 18:23:00 +0000 (18:23 +0000)]
Merge "Use SubscriptionId instead of SubId"
am:
946410eef5
Change-Id: Ib6f689a69ff19b24cc5ac128e77254c0d7624161
Jordan Liu [Fri, 21 Apr 2017 18:17:51 +0000 (18:17 +0000)]
Merge "Use SubscriptionId instead of SubId"
Jeff Sharkey [Fri, 21 Apr 2017 18:08:39 +0000 (12:08 -0600)]
Move PackageManager to new auto-doc feature!
Test: make -j32 offline-sdk-docs
Bug:
37526420
Change-Id: Ib368042e91be3ed702ede0facaf5c8d8d28853d4
Kang Li [Fri, 21 Apr 2017 18:11:33 +0000 (18:11 +0000)]
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
am:
8b4f17be85
Change-Id: I56bb063e1e6ff9003f852a47db355519dec22a69
Seigo Nonaka [Fri, 21 Apr 2017 18:09:44 +0000 (18:09 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev
am:
5b96e55d90
Change-Id: Ic185a25c605e7345afa214d3b50fd859135f7b9b
Wei Jia [Wed, 19 Apr 2017 23:22:10 +0000 (16:22 -0700)]
MediaPlayer: fix new API seekTo to address API review.
Test: compiles
Bug:
36790516
Bug:
37514763
Change-Id: I91307d10e6c9bc65779651c056053b3a025b0d50
TreeHugger Robot [Fri, 21 Apr 2017 18:03:06 +0000 (18:03 +0000)]
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:00:51 +0000 (18:00 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev
Rebecca Silberstein [Fri, 21 Apr 2017 17:41:31 +0000 (17:41 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev
am:
435f1dc7a7 -s ours
Change-Id: Iec3175ed83e50f31154868b634899373b5c53519
Felipe Leme [Fri, 21 Apr 2017 17:35:12 +0000 (17:35 +0000)]
Merge "Removed deprecated SaveInfo methods." into oc-dev
am:
fc533da920
Change-Id: I930aaeaec76f0fa8ffe01bd7ca7bbad0cca977f8
Rebecca Silberstein [Fri, 21 Apr 2017 17:33:41 +0000 (17:33 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 17:28:09 +0000 (17:28 +0000)]
Merge "Removed deprecated SaveInfo methods." into oc-dev
Julia Reynolds [Fri, 21 Apr 2017 17:26:16 +0000 (17:26 +0000)]
Merge "Remove long standing debug code" into oc-dev
am:
f74a736add
Change-Id: Iaf5aba1c4146da1352fea149171832cff88b3978
TreeHugger Robot [Fri, 21 Apr 2017 17:17:17 +0000 (17:17 +0000)]
Merge "Remove long standing debug code" into oc-dev
Dianne Hackborn [Fri, 21 Apr 2017 00:17:48 +0000 (17:17 -0700)]
Fix issue #
32180780: Sync adapters inappropriately being run...
...during full-data backup/restore
The activity manager now tells job scheduler service about the
current backup that is running (only if it is a full backup), it
there is a new condition where we won't consider jobs associated
with the current backup to be ready to run.
Also... just a little optimization here. :) The focus is on
scheduling jobs with a 0 deadline, meaning they should run right
away. Now the timing controller does a quick check for a new
job to see if its constraints are already satisifed, and doesn't
do anything further if that is the case (doesn't add to the list,
doesn't re-evaluate alarms, etc). And in the path to scheduling
a job, we do a check to see if the new job is already ready and if
so then just directly add it to the pending list and schedule it.
Doing this required removing what I think is the last bit of code
relying on handler serializing for thread safety, so now everything
in the job scheduler is protected by our global lock and we can
do whatever we want with the lock held and be assured the state
remains consistent.
Also did some small optimizations to many of the other controllers,
mostly switching from an ArrayList to an ArraySet for their tracked
jobs, since one of the things we do frequently is add/remove jobs.
Finally, added some nullability annotations to the JobScheduler
APIs.
Test: bit CtsJobSchedulerTestCases:*
Change-Id: I533fad94ba59468a52fe3d077a0ceab3427f0012
Tony Mak [Fri, 21 Apr 2017 16:51:19 +0000 (16:51 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev
am:
035aaddbb3
Change-Id: I5b9b7b1a779b46aca047eb589d58a34c456fdf2c
Julia Reynolds [Fri, 21 Apr 2017 16:48:17 +0000 (16:48 +0000)]
Merge "Move companion device check to the handler" into oc-dev
am:
077b1ea14d
Change-Id: Ibb3dcd97136da1d5d131457c2a2596ccc09c1485
Android Build Merger (Role) [Fri, 21 Apr 2017 16:45:45 +0000 (16:45 +0000)]
Merge "Merge "Fix error message: getAllowedCarriers" am:
112d039dfb am:
03f4a0f034 am:
96b140489c" into oc-dev-plus-aosp
Meng Wang [Fri, 21 Apr 2017 16:45:00 +0000 (16:45 +0000)]
Merge "Fix error message: getAllowedCarriers" am:
112d039dfb am:
03f4a0f034
am:
96b140489c
Change-Id: Icec36f8895e4ffb081989973abf563fddbf2f2fd
TreeHugger Robot [Fri, 21 Apr 2017 16:44:44 +0000 (16:44 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:43:20 +0000 (16:43 +0000)]
Merge "Move companion device check to the handler" into oc-dev
Jason Monk [Fri, 21 Apr 2017 16:43:13 +0000 (16:43 +0000)]
Merge "QS + DND interaction again" into oc-dev
am:
d84ff64f96
Change-Id: I0fa2650cb925001c0212b6d528184577f54451a2
Meng Wang [Fri, 21 Apr 2017 16:38:13 +0000 (16:38 +0000)]
Merge "Fix error message: getAllowedCarriers" am:
112d039dfb
am:
03f4a0f034
Change-Id: If62a8b9d7b4a2c36d20cdb00877563a5586a5f72
Pavel Grafov [Fri, 21 Apr 2017 16:35:09 +0000 (16:35 +0000)]
Merge "Fix javadoc for some user restrictions." into oc-dev
am:
9c8bb68071
Change-Id: I0c77cdfdf173f50701ce2cf52a3004b6297ff369
TreeHugger Robot [Fri, 21 Apr 2017 16:35:02 +0000 (16:35 +0000)]
Merge "QS + DND interaction again" into oc-dev
Meng Wang [Fri, 21 Apr 2017 16:32:12 +0000 (16:32 +0000)]
Merge "Fix error message: getAllowedCarriers"
am:
112d039dfb
Change-Id: Ic04b23b87f56261c2c55f1e0a284109bf353c8d0
Bill Yi [Fri, 21 Apr 2017 16:29:37 +0000 (16:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
21b5f4063e -s ours
Change-Id: Ibe6ea76c93c5203c4d528731aeb8bf691deaea3b
TreeHugger Robot [Fri, 21 Apr 2017 16:28:45 +0000 (16:28 +0000)]
Merge "Fix javadoc for some user restrictions." into oc-dev
Wale Ogunwale [Fri, 21 Apr 2017 16:27:11 +0000 (16:27 +0000)]
Merge "Ignore request to add starting window if already visible" into oc-dev
am:
9daf0e62a4
Change-Id: Ic610537f8573292e4bead83482b13c545c5b92b8
Treehugger Robot [Fri, 21 Apr 2017 16:23:33 +0000 (16:23 +0000)]
Merge "Fix error message: getAllowedCarriers"
TreeHugger Robot [Fri, 21 Apr 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 21 Apr 2017 16:19:29 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
03150c4a29 -s ours
Change-Id: Ie39e3beb8efda623bb1ee2669a59c5f0b3c77ac0
TreeHugger Robot [Fri, 21 Apr 2017 16:16:43 +0000 (16:16 +0000)]
Merge "Ignore request to add starting window if already visible" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:12:22 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Seigo Nonaka [Wed, 19 Apr 2017 19:16:39 +0000 (12:16 -0700)]
Cache the Typeface based on the FontRequest.
Bug:
37471729
Test: FontsContractE2ETest
Change-Id: Ifb1bd2b50077471404f5f1dffc01e7697d7042e6
Hyunyoung Song [Fri, 21 Apr 2017 15:30:40 +0000 (15:30 +0000)]
Merge "Support fraction type for inset* for InsetDrawable. b/
36024318" into oc-dev
am:
ab7a2879eb
Change-Id: I8c474b66527b7d718d61e1039840c5fa5d5f21e8
Aurimas Liutikas [Fri, 21 Apr 2017 15:26:24 +0000 (15:26 +0000)]
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev
am:
d3892caf95
Change-Id: I3cdc3a4949ce9636dc3d4b5e5075ccf30f4b29d5
Felipe Leme [Fri, 21 Apr 2017 15:08:39 +0000 (08:08 -0700)]
Removed deprecated SaveInfo methods.
Test: CtsAutoFillServiceTestCases pass
Bug:
37563972
Bug:
33197203
Change-Id: Ie90fa78c31f033c47e7b2f018355ae87759c622b
Kang Li [Wed, 19 Apr 2017 18:56:05 +0000 (11:56 -0700)]
Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS.
bug:
37496130
Test: skipped test, because the change is only in javadoc.
Change-Id: I899d55da59260eabfcea0549a1c6a338bcda2c81
TreeHugger Robot [Fri, 21 Apr 2017 15:14:18 +0000 (15:14 +0000)]
Merge "Support fraction type for inset* for InsetDrawable. b/
36024318" into oc-dev
Aurimas Liutikas [Fri, 21 Apr 2017 15:14:04 +0000 (15:14 +0000)]
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev
Pavel Grafov [Fri, 21 Apr 2017 13:48:21 +0000 (14:48 +0100)]
Fix javadoc for some user restrictions.
DISALLOW_UNMUTE_MICROPHONE and DISALLOW_ADJUST_VOLUME can
be set by POs on secondary users as well. But they have no
effect on managed profiles.
(In the bug I erroneously mentionted DISALLOW_UNMUTE_DEVICE
which is @hidden instead of *_MICROPHONE).
Bug:
36024135
Test: IntelliJ quickdoc popup renders correctly.
Change-Id: I7a0e77ac993846cdc3a4ddf4d457e1282872107f
Julia Reynolds [Thu, 20 Apr 2017 15:31:30 +0000 (11:31 -0400)]
Move companion device check to the handler
To return faster to the app that's creating channels, since
companion device manager has to read from xml.
Fixes:
37534164
Test: runtest systemui-notification, manual with an app with strict
mode on.
Change-Id: I78909ba3ca6b33302fb78756b49c9014de5aeb12
Julia Reynolds [Wed, 19 Apr 2017 17:50:12 +0000 (13:50 -0400)]
Remove long standing debug code
Because it stops real errors from bubbling up to the calling app.
Test: make, post notifications
Change-Id: I0e59c61b0a60302a5fd023b7ad909e84b97e5df5
Fixes:
37494547
Michal Karpinski [Fri, 21 Apr 2017 12:30:02 +0000 (12:30 +0000)]
Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev
am:
0db9724b6c
Change-Id: I36ac24d6ffa41eda4d7cacee931410ee933744d3
Michal Karpinski [Fri, 21 Apr 2017 12:20:58 +0000 (12:20 +0000)]
Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev
Bill Yi [Fri, 21 Apr 2017 11:21:57 +0000 (04:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ida4d17127df81670a51a4bf933d8df61729fa2c4
Auto-generated-cl: translation import
Abodunrinwa Toki [Fri, 21 Apr 2017 11:09:50 +0000 (11:09 +0000)]
Merge "SmartSelection ConfigUpdater: Ignore version numbers" into oc-dev
am:
924d482a44
Change-Id: I6de3b90235b311a1a1c6344a8517e2ae9e643b5b
TreeHugger Robot [Fri, 21 Apr 2017 11:05:45 +0000 (11:05 +0000)]
Merge "SmartSelection ConfigUpdater: Ignore version numbers" into oc-dev
Artem Iglikov [Fri, 21 Apr 2017 08:50:56 +0000 (09:50 +0100)]
[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup().
Before it was returning null in case the service was not initialized,
but as the method signature has int as the return type, this was boxed
and unboxed which would cause NPE.
Now it will return BackupManager.ERROR_BACKUP_NOT_ALLOWED instead.
This doesn't include fix for the test, because it's going to be
cherry-picked into oc-dev, which doesn't have the tests.
Test: manually ran unit tests
Bug:
37535747
Change-Id: I186cf812a4ec67be943b5c4334c82e9af5320b7a
Clara Bayarri [Fri, 21 Apr 2017 09:50:13 +0000 (09:50 +0000)]
Merge "Update Typeface callback docs about error codes" into oc-dev
am:
337be5a12f
Change-Id: I145d3a197d6d1457b95afdbf08bb1caef6cf8446
TreeHugger Robot [Fri, 21 Apr 2017 09:44:48 +0000 (09:44 +0000)]
Merge "Update Typeface callback docs about error codes" into oc-dev
Bill Yi [Fri, 21 Apr 2017 09:42:01 +0000 (02:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I231c6c8609a64f510f3902840053fb056a7e8509
Auto-generated-cl: translation import
Erik Kline [Fri, 21 Apr 2017 09:18:50 +0000 (09:18 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name" am:
649c459858 am:
f7c93bcd45
am:
6305795287
Change-Id: Idf256ced2c3403f9672b29c10ec02adb44a0ab7c
Erik Kline [Fri, 21 Apr 2017 09:13:16 +0000 (09:13 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name" am:
649c459858
am:
f7c93bcd45
Change-Id: I7eab6f5027628711381b09188779cad164910f51
Erik Kline [Fri, 21 Apr 2017 09:07:46 +0000 (09:07 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name"
am:
649c459858
Change-Id: Ia856b08ced4e26e32e107faac37e1c245caaf910
Erik Kline [Fri, 21 Apr 2017 08:59:30 +0000 (08:59 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name"
Bill Yi [Fri, 21 Apr 2017 08:03:35 +0000 (08:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4b76d33968 -s ours
Change-Id: Idf537deb9593253c352a3dbcbb4a18ecfdc1e487