OSDN Git Service
TreeHugger Robot [Fri, 11 Aug 2017 19:53:32 +0000 (19:53 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
Tyler Gunn [Fri, 11 Aug 2017 18:33:44 +0000 (18:33 +0000)]
Merge changes from topic 'call-session-may'
am:
21e4dbb6ed
Change-Id: I20a3a9f7808211187da8434a0b1490081a92e8d8
Tyler Gunn [Fri, 11 Aug 2017 18:14:02 +0000 (18:14 +0000)]
Merge changes from topic 'call-session-may'
* changes:
Add callSessionMayHandover API to ImsCallSession.
IMS: Support for Possible Call Session Handover
Steven Moreland [Fri, 11 Aug 2017 17:52:35 +0000 (10:52 -0700)]
Reference ScopedUtfChar header correctly.
Bug:
63762847
Test: finds header in proper location
Change-Id: I4963ab3133c405a90564112f0d9af602ace0eab5
Brad Ebinger [Fri, 11 Aug 2017 00:42:30 +0000 (00:42 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
am:
a46600e0e7
Change-Id: If849e9ed61271bf233f4e149ef766e2e7b0d7851
Treehugger Robot [Fri, 11 Aug 2017 00:31:41 +0000 (00:31 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
Brad Ebinger [Thu, 27 Jul 2017 19:57:03 +0000 (12:57 -0700)]
Change IMS callback AIDLs to be oneway
A bad behaving service was causing the IMS registration
callbacks to block indefinetly waiting for the callback
binder implementation in another process to finish. Since
we update the IMS registration in a loop, we were never getting
to the updates for the other processes.
This change moves the AIDL definition to oneway. Since these
are callback AIDLs, the caller doesn't need to wait
for the callbacks to return before sending the others.
Bug:
63137625
Test: Manual
Merged-In: I0e049166ddf3604d312748b63a94fa6ebe77c29d
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
Brad Ebinger [Thu, 10 Aug 2017 23:02:56 +0000 (23:02 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
am:
6ffc855e8d
Change-Id: Ifa04b6260d51c17dc323fab918db0bdbf2bdea64
Brad Ebinger [Thu, 10 Aug 2017 22:50:45 +0000 (22:50 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
Amit Mahajan [Thu, 10 Aug 2017 16:12:19 +0000 (16:12 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
am:
cd03d0db9d
Change-Id: I386f5e4de89c4ac758e1702b2efdc16a43c12c33
Amit Mahajan [Thu, 10 Aug 2017 16:06:36 +0000 (16:06 +0000)]
Merge "Get isim card data use subId."
am:
854edcff16
Change-Id: I0a562f9966838cc6746c170b3bba9a250fd2633b
Amit Mahajan [Thu, 10 Aug 2017 15:59:43 +0000 (15:59 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
Amit Mahajan [Thu, 10 Aug 2017 15:57:38 +0000 (15:57 +0000)]
Merge "Get isim card data use subId."
Brad Ebinger [Thu, 22 Jun 2017 18:39:11 +0000 (11:39 -0700)]
Add method that checks the Binder status of ImsConfig
Adds a method to check whether or not the ImsConfig
binder has died.
Bug:
62723694
Test: maual, follow bug procedure
Merged-In: I0ecd6a43d4375d3ac4d7d54b3d437832c0221f05
Change-Id: I9df6533e7e7dc69487cea50fada6c89599b031a3
Erik Kline [Wed, 9 Aug 2017 22:23:24 +0000 (22:23 +0000)]
Merge "Add future consideration for USB rndis notification handling"
am:
4263a5ed58
Change-Id: I7dd347447434214ecf3e5f9f8e2a603cd097f6c6
Treehugger Robot [Wed, 9 Aug 2017 22:10:19 +0000 (22:10 +0000)]
Merge "Add future consideration for USB rndis notification handling"
Erik Kline [Wed, 9 Aug 2017 03:53:46 +0000 (20:53 -0700)]
Add future consideration for USB rndis notification handling
Test: builds
Bug:
63970368
Merged-In: If6afe1cdce9995251ba53fbf30acf9d6e31f9433
Merged-In: I78e280c2299ec3f4d97138ca648f9629ba82e87f
Merged-In: I891cd82b0e8af1049fa3ab9b0a95a2a9ab2e0b26
Change-Id: Ic9ca133a44123f281bd4cfeac57d426346c2b76d
(cherry picked from commit
1290568110405fd45f13824e67beeb98c30400a4)
Jakub Pawlowski [Wed, 9 Aug 2017 19:15:08 +0000 (19:15 +0000)]
Merge "Bluetooth: AdvertiseData parceling simplification"
am:
c7da241b3e
Change-Id: Iaf58ace037810d11fcb29c2696c79664d601e87c
Erik Kline [Wed, 9 Aug 2017 19:12:23 +0000 (19:12 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts."
am:
d27af8af62
Change-Id: I33633e064a329b9094b0d279622febab6266e5cb
Tyler Gunn [Wed, 9 Aug 2017 19:03:32 +0000 (19:03 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis."
am:
647b520a00
Change-Id: I8962fc326d0e2888656c2764e94131c6eebd1471
Jakub Pawlowski [Wed, 9 Aug 2017 18:56:57 +0000 (18:56 +0000)]
Merge "Bluetooth: AdvertiseData parceling simplification"
Treehugger Robot [Wed, 9 Aug 2017 18:54:32 +0000 (18:54 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts."
Treehugger Robot [Wed, 9 Aug 2017 18:44:08 +0000 (18:44 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis."
nharold [Wed, 9 Aug 2017 17:49:42 +0000 (17:49 +0000)]
Merge "Add UserQuotaTracker to IpSecService"
am:
a0c97b3ddb
Change-Id: I43a9617b077ecd5fc2b445a1ade8b76c00562640
Jason Monk [Wed, 9 Aug 2017 17:47:52 +0000 (17:47 +0000)]
Merge "Prevent data usage dialog from being displayed again"
am:
48e8091eda
Change-Id: Iaf17879b3a708585a2ae4cc7460527a3f998bce4
Lorenzo Colitti [Wed, 9 Aug 2017 17:45:22 +0000 (17:45 +0000)]
Merge "Minor fixes for netd restarts and StrictController."
am:
2f5ca257b5
Change-Id: If9a156c516f35c48055012ec6ab7ed5ccaa6b259
Erik Kline [Tue, 8 Aug 2017 01:11:22 +0000 (18:11 -0700)]
Always note the state of RNDIS from USB broadcasts.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
63970368
Merged-In: I53115deda25ca83a00bd9de12891a72028647d12
Merged-In: I317b694c3a8c76077c031c4410d5b97ed79c1bbc
Merged-In: Ie226534011d6439c24cfe1957c5cf47ba171b0c0
Change-Id: I273edbe21fea586f1353ff378515401efc6bb15e
(cherry picked from commit
3897dc179f23dfbaf10f0139160aa29a232144f5)
Chen Xu [Wed, 9 Aug 2017 17:42:29 +0000 (17:42 +0000)]
Merge "initial value for data_roaming based on carrier"
am:
973ddd55eb
Change-Id: I374dd9e18f9e3bc5e9fe1ea945923f81df90fa15
Jakub Pawlowski [Tue, 8 Aug 2017 22:47:57 +0000 (15:47 -0700)]
Bluetooth: AdvertiseData parceling simplification
Use writeTypedArray instead of writeList - this will not serialize
string with type name, which is unnecessary
Use createByteArray instead of readByteArra - it takes care of null and
empty array handling
Test: sl4a FilteringTest, BleAdvertiseApiTest
Change-Id: I6a22674a0bf9933e39691de7f2b2b52a060ae368
nharold [Wed, 9 Aug 2017 17:05:49 +0000 (17:05 +0000)]
Merge "Add UserQuotaTracker to IpSecService"
Tyler Gunn [Thu, 1 Jun 2017 21:12:54 +0000 (14:12 -0700)]
Enforce call log length limit on a per PhoneAccount basis.
Performing the auto delete based on the PhoneAccount of the new entry.
This ensures no one CS can cause the removal of entries by another.
Test: Manual
Bug:
38196259
Merged-In: I382cb62a1b2b7e482c49ece05f90fc982b797add
Change-Id: I382cb62a1b2b7e482c49ece05f90fc982b797add
Jason Monk [Wed, 9 Aug 2017 13:41:54 +0000 (13:41 +0000)]
Merge "Prevent data usage dialog from being displayed again"
Jakub Pawlowski [Wed, 9 Aug 2017 07:45:34 +0000 (00:45 -0700)]
resolve merge conflicts of
15658662fdde to stage-aosp-master
Test: this fixes merge conflict that I skipped
Change-Id: I2e993d1f021b1bb671b07440cdc611853d6c3f08
Treehugger Robot [Wed, 9 Aug 2017 10:26:14 +0000 (10:26 +0000)]
Merge "Minor fixes for netd restarts and StrictController."
Chen Xu [Wed, 9 Aug 2017 07:24:05 +0000 (07:24 +0000)]
Merge "Handle invalid destination address gracefully"
am:
a753dfd2e8
Change-Id: I103f925d8008748b5cc5e15a48f0773c092e293a
Jordan Liu [Wed, 9 Aug 2017 07:21:22 +0000 (07:21 +0000)]
Merge "Fix error message strings"
am:
67862237e9
Change-Id: I5dc11be348893ed61b1aee8777059967ac7b910e
Hampus Wessman [Wed, 9 Aug 2017 07:19:11 +0000 (07:19 +0000)]
Merge "Fix graphical artifact in the fisheye effect"
am:
0b885b8096
Change-Id: I07a41a6a7e7cb7f145b3624bf58e4addeeb24547
Jack Yu [Wed, 9 Aug 2017 07:16:37 +0000 (07:16 +0000)]
Merge "Moved channels settings from carrier config to resources"
am:
79eddf8c0a
Change-Id: If2c2e6e1d260fae50a15c8a3aa8fba4460884ec1
Jakub Pawlowski [Wed, 9 Aug 2017 07:13:32 +0000 (07:13 +0000)]
Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)"
am:
15658662fd -s ours
Change-Id: I3af0324d3a2029b5b4c27625c1c0b6f74363fc59
yanxue.xu [Thu, 13 Jul 2017 08:40:55 +0000 (16:40 +0800)]
Get isim card data use subId.
Get isim card data is obtained the default card data instead of the corresponding card data.
It is necessary to obtain the card data according to the subid.
Test: Get isim card data use subId.
Change-Id: I9ad90f8180f35449879507b6f086c4be01aacc9d
Nathan Harold [Mon, 24 Apr 2017 23:16:34 +0000 (16:16 -0700)]
Add UserQuotaTracker to IpSecService
Add a small tracking object to enforce maximum
quotas for SPIs, Transforms, and Encap sockets. The
current quota limits are intentionally conservative
with the expectation that we can relax them more
easily than we can shrink them.
Bug:
37688603
Test: tbd
Change-Id: Iee59ac59ef9f4a7ab75a2e04f9ca72da82fc3229
Chen Xu [Wed, 9 Aug 2017 01:19:24 +0000 (01:19 +0000)]
Merge "initial value for data_roaming based on carrier"
Chen Xu [Wed, 9 Aug 2017 01:09:42 +0000 (01:09 +0000)]
Merge "Handle invalid destination address gracefully"
Jordan Liu [Wed, 9 Aug 2017 00:41:57 +0000 (00:41 +0000)]
Merge "Fix error message strings"
fionaxu [Fri, 23 Jun 2017 01:14:23 +0000 (18:14 -0700)]
initial value for data_roaming based on carrier
1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.
Bug:
36193933
Test: manual test
Change-Id: Ie4f3a0714059e1a7257c84802db475c92c17e1b3
Treehugger Robot [Wed, 9 Aug 2017 00:00:43 +0000 (00:00 +0000)]
Merge "Fix graphical artifact in the fisheye effect"
Treehugger Robot [Tue, 8 Aug 2017 23:56:05 +0000 (23:56 +0000)]
Merge "Moved channels settings from carrier config to resources"
fionaxu [Tue, 20 Jun 2017 06:22:29 +0000 (23:22 -0700)]
Handle invalid destination address gracefully
Bug:
37578305
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java --test-method testSendTextWithInvalidDestAddr
Change-Id: I2e79acb66178586d29dc89ad018f2726ed654a85
Jordan Liu [Tue, 8 Aug 2017 23:06:17 +0000 (16:06 -0700)]
Fix error message strings
mmcc_imsi_unknown_in_hlr and mmcc_illegal_ms are updated to reflect
newly supported requirements.
Fixes:
64194949
Test: manual
Change-Id: I358ba1d562d30e958580003336ace3941bd5e04f
Jakub Pawlowski [Tue, 8 Aug 2017 22:39:31 +0000 (22:39 +0000)]
Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)"
Jack Yu [Thu, 4 May 2017 18:50:51 +0000 (11:50 -0700)]
Moved channels settings from carrier config to resources
Since CBS channels are more countries specific instead
of carrier specific, moving it to resources makes
more sense.
Test: Manual
bug:
31223529
Merged-In: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
Change-Id: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
Tyler Gunn [Fri, 9 Jun 2017 20:16:06 +0000 (13:16 -0700)]
Add callSessionMayHandover API to ImsCallSession.
This matches the new AIDL definition in the API.
Test: Manual
Bug:
62489988
Change-Id: I97ad5b5359f19d533b5b8644fd37008c0c69bf9c
Anju Mathapati [Mon, 27 Mar 2017 22:43:20 +0000 (15:43 -0700)]
IMS: Support for Possible Call Session Handover
Adding the callSessionMayHandover API that allows
for the lower layers to indicate that the call session
may handover based on actions taken by the user/UI
layer.
The API provides current and target RAT information
pertaining to the possible handover.
Bug:
62489988
Test: Manual
Change-Id: I006462ce5688bb99a94d5135574fb2c17878685a
Jakub Pawlowski [Tue, 8 Aug 2017 11:27:20 +0000 (04:27 -0700)]
Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)
This patch moves *.aidl files from
frameworks/base/core/java/android/bluetooth into system/bt/binder. This
is in preparation to convert the Bluetooth deamon into native
implementation piece by piece.
In order to do that, one must have C++ header files, and paths to them
with AIDL files, and */java/* folder didn't seem as proper place for
that. Additionally, keeping AIDL files out of framework/base will not
require creating dependency on this huge project, which should help
keeping the compilation fast.
Test: compilation test
Change-Id: I9a6db8832c9ec3215c648e325d67278832ef22cc
Merged-In: I9a6db8832c9ec3215c648e325d67278832ef22cc
(cherry picked from commit
06ae9c665b6fce7a748c3d7175359bff8343768c)
Takashi Furukawa [Tue, 8 Aug 2017 18:14:53 +0000 (18:14 +0000)]
Merge "Add null check for Wi-Fi command"
am:
43ee2ac140
Change-Id: Ideddbcd85dc15012f405138c358f3dd8c516eef5
Treehugger Robot [Tue, 8 Aug 2017 18:03:14 +0000 (18:03 +0000)]
Merge "Add null check for Wi-Fi command"
Calin Juravle [Tue, 8 Aug 2017 17:13:06 +0000 (17:13 +0000)]
Merge "Update DexLoadReporter to comply with the new reporting API"
am:
89d087886d
Change-Id: If94d3ecb40eef29acb0ab6709de23b37a722119b
Calin Juravle [Tue, 8 Aug 2017 17:03:21 +0000 (17:03 +0000)]
Merge "Update DexLoadReporter to comply with the new reporting API"
Hugo Benichi [Tue, 8 Aug 2017 08:40:40 +0000 (08:40 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
am:
c06dbc114f -s ours
Change-Id: Idfc34008bf7d9c636ee67fed3f07552be688052d
Treehugger Robot [Tue, 8 Aug 2017 08:30:03 +0000 (08:30 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
Hugo Benichi [Tue, 8 Aug 2017 07:34:39 +0000 (07:34 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk"
am:
05be68698b
Change-Id: Iff94ca7089c074cc44f8e09cbce01f741c0b5c67
Hugo Benichi [Tue, 8 Aug 2017 07:28:32 +0000 (07:28 +0000)]
Merge "Fix flaky IpPrefixTest."
am:
2cbce2cb27 -s ours
Change-Id: Iabc8a365a6c18c19754da7ddfcc0385eb5b0f768
Hugo Benichi [Tue, 8 Aug 2017 07:20:07 +0000 (07:20 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk"
Treehugger Robot [Tue, 8 Aug 2017 07:16:48 +0000 (07:16 +0000)]
Merge "Fix flaky IpPrefixTest."
Hugo Benichi [Tue, 8 Aug 2017 07:16:12 +0000 (07:16 +0000)]
Merge "Add OWNERS to com.android.server.net"
am:
0a00151bd1
Change-Id: Ib9938dd15a173d459ca67e5dc19430da57c29115
Treehugger Robot [Tue, 8 Aug 2017 07:07:25 +0000 (07:07 +0000)]
Merge "Add OWNERS to com.android.server.net"
Hugo Benichi [Fri, 4 Aug 2017 03:12:25 +0000 (12:12 +0900)]
DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies
Rational for do not merge: the list of native libraries needed in
Android.mk is not consistent at the moment for aosp master and for
internal branches. Furthermore it is not consistent within internal
branches either. This patch only attempts to fix the tests of the
branches where it matters for development. Otherwise the cost of merge
conflicts makes it undesirable.
Test: All tests in runtest frameworks-net pass.
Merged-In: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708
(cherry pick from commit
99e8ab6e46eec5dbd1b059b3732672d537b3cf34)
Change-Id: Ic732b3dafc3497235e455b8748ac4f99cf02b221
Hugo Benichi [Mon, 7 Aug 2017 01:27:04 +0000 (10:27 +0900)]
Add OWNERS to com.android.server.net
Test: build
Change-Id: I9236489814103ab20b077ebfc30155dcdb66d411
Hugo Benichi [Thu, 10 Nov 2016 13:45:56 +0000 (22:45 +0900)]
Fix flaky IpPrefixTest.
Test: IpPrefixTest passes
Bug:
32561414
Merged-In: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645
(cherry pick from commit
32c687040301cb3601fd110281a742159a963aa9)
Change-Id: Ibaf11aae9b13af868bebff820c9e7615b63c8eb2
naoyuki kato [Tue, 22 Nov 2016 04:27:11 +0000 (13:27 +0900)]
Prevent data usage dialog from being displayed again
The data usage dialog is displayed every time rotating the device.
To solve this issue, prevent NetworkOverLimitActivity from being
re-created when rotating the device.
Bug:
36801016
Test: manual - show NetworkOverLimitActivity and rotate the device
Change-Id: I51429aa49157756107e9b3fa9d450f82f894dcab
Hugo Benichi [Tue, 8 Aug 2017 01:46:57 +0000 (10:46 +0900)]
Connectivity OWNERS: let owners modify Android.mk
Since per-file overwrites the directory default, just allowing
build.master@android.com for Android.mk with a per-file rule prevents
the owners of the directory to modify Android.mk files without bypassing
OWNERS check in gerrit.
This patch fixes this issue for Connectivity OWNERS files by explicitly
listing Connectivity members for a few Android.mk files.
Test: build
Change-Id: I9c2a2519c3e7dd27e66334b090e074968b408cbc
Lorenzo Colitti [Tue, 18 Jul 2017 15:23:44 +0000 (00:23 +0900)]
Minor fixes for netd restarts and StrictController.
1. Ensure we don't change strict mode network policy for a given
UID from a non-accept policy to another non-accept policy,
as netd does not support this.
2. Move the "strict enable" and "bandwidth enable" commands
inside the lock. This improves correctness, and it is safe to
do now that those commands now only take a few milliseconds,
instead of several hundred milliseconds.
3. Fix an NPE in connectNativeNetdService which causes the system
to crash when netd crashes.
Bug:
28362720
Test: bullhead builds, boots
Test: "adb shell killall netd" no longer crashes the system
Change-Id: Icdaa9d1e2288accf35de21df56bc6bd2b0628255
Colin Cross [Mon, 7 Aug 2017 19:32:21 +0000 (19:32 +0000)]
Merge "Use class retention for VisibleForTesting annotations"
am:
5724841581
Change-Id: Iaa9262ad627b49d58b46760d7aecd3a985c3a79a
Treehugger Robot [Mon, 7 Aug 2017 19:17:33 +0000 (19:17 +0000)]
Merge "Use class retention for VisibleForTesting annotations"
Colin Cross [Fri, 4 Aug 2017 23:39:05 +0000 (16:39 -0700)]
Use class retention for VisibleForTesting annotations
The VisibleForTesting annotations are used by proguard to prevent
stripping code that is needed at runtime for tests. The annotations
were marked with source retention, which worked fine with Jack's
proguard implementation. When we switched back to javac + proguard,
the VisibleForTesting annotations are gone by the time proguard
sees the classes, so the annotated classes and methods can still
be stripped.
Move the VisibleForTesting annotation to class retention, which
matches guava's equivalent annotation.
Bug:
64365384
Test: m -j MtpDocumentsProvider &&
javap -cp out/target/common/obj/APPS/MtpDocumentsProvider_intermediates/classes-proguard.jar com.android.mtp.MtpRoot
Change-Id: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
Merged-In: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
(cherry picked from commit
8e846143ddc285117d391561de7abd670078d27f)
TreeHugger Robot [Mon, 7 Aug 2017 05:12:45 +0000 (05:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 7 Aug 2017 05:12:04 +0000 (05:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 7 Aug 2017 05:09:59 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 7 Aug 2017 05:08:40 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 7 Aug 2017 05:08:08 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 7 Aug 2017 05:07:30 +0000 (05:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 7 Aug 2017 05:05:38 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 7 Aug 2017 05:04:31 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 7 Aug 2017 05:03:27 +0000 (05:03 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 7 Aug 2017 04:59:49 +0000 (04:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Mon, 7 Aug 2017 00:08:53 +0000 (17:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: If82f8619d0d6749a01b90dc6b4898eb4019743af
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Mon, 7 Aug 2017 00:04:01 +0000 (17:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4570757171ce669661c9064ed555177d0c26cf1a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 22:42:00 +0000 (15:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1053ce2f24b423a0a3bccd06b1eb886a196f11e2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 22:36:51 +0000 (15:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I54df9444d8466bc63aca95417f8b5c49ec5568e1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 22:22:38 +0000 (15:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I149ea5a3d107bd0e5cdad51d242366bf14d1f698
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 22:17:51 +0000 (15:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e2e91f54e7f1add2fb3b12dd1d131899380af64
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 22:09:48 +0000 (15:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I84ca884466c9fbd5489c7f47b0518fd336306099
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 22:05:09 +0000 (15:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3629af0eb29095e5657e68cfee82f98eb14e34ea
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 21:59:06 +0000 (14:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I772efbffcbd3837cd39fe75cc74c8a94772e3bc9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 21:52:16 +0000 (14:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I74ba347c5a9424ce65c02cff2cec531ba01f7428
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 16:53:45 +0000 (09:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I324f912c470060a8e63d5ab1c307507959a0a0ec
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jeff Hao [Sat, 5 Aug 2017 01:02:04 +0000 (01:02 +0000)]
Merge "Add dirty_image_objects file."
am:
935e0c996a
Change-Id: I022e4349152e8fd8a33b6afe7b659af019ad950e
Treehugger Robot [Sat, 5 Aug 2017 00:55:48 +0000 (00:55 +0000)]
Merge "Add dirty_image_objects file."
Hugo Benichi [Sat, 5 Aug 2017 00:54:43 +0000 (00:54 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences"
am:
7575ec2240
Change-Id: If38efacdeec8476880835657938e435f9b598525
Hugo Benichi [Sat, 5 Aug 2017 00:43:20 +0000 (00:43 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences"