OSDN Git Service
Nathan Harold [Thu, 22 Oct 2015 05:28:26 +0000 (05:28 +0000)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am:
0dccd12800
am:
64e8bdc476
* commit '
64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 05:23:34 +0000 (05:23 +0000)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
am:
0dccd12800
* commit '
0dccd128001ceff9437f736bd70dfd1986e315d5':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 03:12:10 +0000 (20:12 -0700)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
-Fixed doc string
Bug:
23979591
This reverts commit
f7b6474de87fd2eee377dc612c757102cdacc003.
Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702
Nathan Harold [Thu, 22 Oct 2015 03:03:18 +0000 (03:03 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am:
42015c4081
am:
5be7dbc88d
* commit '
5be7dbc88d0460dfede5373f1204f4645ce99726':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 02:58:15 +0000 (02:58 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
am:
42015c4081
* commit '
42015c4081f9d37d579f0be15e11725cf6cc5fba':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 02:54:45 +0000 (02:54 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
Nathan Harold [Thu, 22 Oct 2015 02:53:57 +0000 (02:53 +0000)]
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
This reverts commit
5d1429e0dd1a13f76dbb354f9e4e415f71956299.
Doc string isn't resolving. Temporarily reverting.
Change-Id: I128b13abcf938c96b24225e373ac0885c24e083e
Nathan Harold [Thu, 22 Oct 2015 02:08:56 +0000 (02:08 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am:
f8a4dc4a6f
am:
dc9f8fab0f
* commit '
dc9f8fab0fd9485b22651fe5c7f70961d67d697a':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 02:03:32 +0000 (02:03 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev
am:
f8a4dc4a6f
* commit '
f8a4dc4a6f8383fc2999ce1292d900912a0da842':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 01:58:37 +0000 (01:58 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev
Adrian Roos [Thu, 22 Oct 2015 00:56:26 +0000 (00:56 +0000)]
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am:
33e1d376eb
am:
655c12edb0
* commit '
655c12edb0312933249659ab6b23191adcba4fa3':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:49:52 +0000 (00:49 +0000)]
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev
am:
33e1d376eb
* commit '
33e1d376ebd643cba5b507d0005b87d49e246bb5':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:46:03 +0000 (00:46 +0000)]
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev
Dianne Hackborn [Thu, 22 Oct 2015 00:45:44 +0000 (00:45 +0000)]
Merge "Hopefully fix issue #
25153459: Sandboxed_process1 thrashing" into mnc-dr-dev am:
676534e008
am:
75c2993c91
* commit '
75c2993c91e9088572bc0eae6f424717deafc963':
Hopefully fix issue #
25153459: Sandboxed_process1 thrashing
Dianne Hackborn [Thu, 22 Oct 2015 00:40:35 +0000 (00:40 +0000)]
Merge "Hopefully fix issue #
25153459: Sandboxed_process1 thrashing" into mnc-dr-dev
am:
676534e008
* commit '
676534e00805e8102ea1458eba2b2cab1dbe7b3d':
Hopefully fix issue #
25153459: Sandboxed_process1 thrashing
Dianne Hackborn [Thu, 22 Oct 2015 00:37:33 +0000 (00:37 +0000)]
Merge "Hopefully fix issue #
25153459: Sandboxed_process1 thrashing" into mnc-dr-dev
Adrian Roos [Wed, 21 Oct 2015 21:50:38 +0000 (14:50 -0700)]
Track ashmem memory usage in Parcel
Bug:
25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
(cherry picked from commit
4701a496a5477a7de01fbc9eaf4af9812f83770c)
Dianne Hackborn [Thu, 22 Oct 2015 00:12:53 +0000 (17:12 -0700)]
Hopefully fix issue #
25153459: Sandboxed_process1 thrashing
There is a race where if you unbind to a service before its
process has come up, we would leave the service record active
and keep it running. Fix this by checking the service state
after its process up and proceed to bring it down if it is no
longer needed.
Also added a similar check when restarting a service, just in
case there are other ways we can get into this situation.
And while I am at it, I tweaked the broadcast queue dump output
a bit to hopefully make it a lot easier to figure out how long
it is taking to process broadcasts.
Change-Id: I46b98f1fe394ab8039ea4cc81fb5d3afb6391a31
Daniel Sandler [Wed, 21 Oct 2015 23:24:36 +0000 (23:24 +0000)]
Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev am:
cb10c09f0a
am:
b4aa8b0c5b
* commit '
b4aa8b0c5b65d301611ca4c0492b2a9ed67a5a1a':
Delay hiding the cast icon for 3 seconds.
Daniel Sandler [Wed, 21 Oct 2015 23:18:54 +0000 (23:18 +0000)]
Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev
am:
cb10c09f0a
* commit '
cb10c09f0a6c0750d79bf4f681a623fa35f4cef7':
Delay hiding the cast icon for 3 seconds.
Daniel Sandler [Wed, 21 Oct 2015 23:14:50 +0000 (23:14 +0000)]
Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds.
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug:
19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
Adam Powell [Wed, 21 Oct 2015 20:54:26 +0000 (20:54 +0000)]
Merge "Don\'t query ChooserTargetService apps that haven\'t been used recently" into mnc-dr-dev am:
b8cfc12c3f
am:
8c7b3e872b
* commit '
8c7b3e872b28fa466cd1c0e314771871a15104ad':
Don't query ChooserTargetService apps that haven't been used recently
Selim Cinek [Wed, 21 Oct 2015 20:52:29 +0000 (20:52 +0000)]
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev am:
688e046bad
am:
f9c4f745e6
* commit '
f9c4f745e6a4e8586baab085dc86b9b2b187f48a':
Changing the ordering for heads up notifications
Adam Powell [Wed, 21 Oct 2015 20:47:14 +0000 (20:47 +0000)]
Merge "Don\'t query ChooserTargetService apps that haven\'t been used recently" into mnc-dr-dev
am:
b8cfc12c3f
* commit '
b8cfc12c3f0b83e9d00b1f324be4ff5c977645ce':
Don't query ChooserTargetService apps that haven't been used recently
Selim Cinek [Wed, 21 Oct 2015 20:45:17 +0000 (20:45 +0000)]
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev
am:
688e046bad
* commit '
688e046bad87cc722e8571b8f4180604623239a8':
Changing the ordering for heads up notifications
Todd Kennedy [Wed, 21 Oct 2015 20:45:13 +0000 (20:45 +0000)]
Merge "Maintain shared user list on OTA" into mnc-dr-dev am:
0cd10ec8cf
am:
d12f298da4
* commit '
d12f298da4748321d9023185a4ee09c3324c4673':
Maintain shared user list on OTA
Adam Powell [Wed, 21 Oct 2015 20:40:45 +0000 (20:40 +0000)]
Merge "Don't query ChooserTargetService apps that haven't been used recently" into mnc-dr-dev
Selim Cinek [Wed, 21 Oct 2015 20:39:28 +0000 (20:39 +0000)]
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev
Jeff Sharkey [Wed, 21 Oct 2015 20:38:29 +0000 (20:38 +0000)]
Narrow permission re-granting to specific volume. am:
052366ca4e
am:
0b639c78f1
* commit '
0b639c78f112252b93314f016b0e1ed1abafc4e3':
Narrow permission re-granting to specific volume.
Todd Kennedy [Wed, 21 Oct 2015 20:38:28 +0000 (20:38 +0000)]
Merge "Maintain shared user list on OTA" into mnc-dr-dev
am:
0cd10ec8cf
* commit '
0cd10ec8cf7a896bbdfc0639bf5f9c663c46edbb':
Maintain shared user list on OTA
Todd Kennedy [Wed, 21 Oct 2015 20:33:31 +0000 (20:33 +0000)]
Merge "Maintain shared user list on OTA" into mnc-dr-dev
Jeff Sharkey [Wed, 21 Oct 2015 20:32:42 +0000 (20:32 +0000)]
Narrow permission re-granting to specific volume.
am:
052366ca4e
* commit '
052366ca4e6138b583d08535bd1837deb7cd58d0':
Narrow permission re-granting to specific volume.
Todd Kennedy [Wed, 21 Oct 2015 20:09:10 +0000 (13:09 -0700)]
Maintain shared user list on OTA
When a package is removed during an OTA, we weren't removing it from the
shared user list. This means anyone asking for the packages for a shared
UID would continue to see the old package.
Bug:
24906701
Change-Id: Ifb6d64195e6b8af7454e19591611af66a40cbd10
Adam Powell [Wed, 21 Oct 2015 20:21:28 +0000 (13:21 -0700)]
Don't query ChooserTargetService apps that haven't been used recently
Resolver/ChooserActivity sort apps based on usage factors for the last
two weeks. A score of zero means no usage data within that timeframe.
For system health and UI relevance, don't bother even waking up apps
that have zero scores.
Bug
25126166
Change-Id: Iae34a9667eb1985d6fe986670f3fb3f1177576da
Anthony Hugh [Wed, 21 Oct 2015 18:59:00 +0000 (18:59 +0000)]
Merge "Watch dialer should have phone permission fixed" into cw-e-dev
am:
52c6f9ecb3
* commit '
52c6f9ecb3b5c49a16f493f9e1111d1c10a48bd7':
Watch dialer should have phone permission fixed
Anthony Hugh [Wed, 21 Oct 2015 18:52:51 +0000 (18:52 +0000)]
Merge "Watch dialer should have phone permission fixed" into cw-e-dev
Anthony Hugh [Mon, 19 Oct 2015 20:42:26 +0000 (13:42 -0700)]
Watch dialer should have phone permission fixed
Watch dialer should have phone permission as fixed.
BUG:
24976862
Change-Id: I8bbc63ab0d7dfb2e38eec641681ac9aacae330a0
Nathan Harold [Wed, 21 Oct 2015 17:51:02 +0000 (10:51 -0700)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Bug:
23979591
Change-Id: I16ffa7666fdf0eb081bb1bafa57ebd384d7c3fdf
Geoff Mendal [Wed, 21 Oct 2015 18:24:03 +0000 (18:24 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
255103a79f -s ours
* commit '
255103a79f1ffd4e7511c7281618404dcc06a4ba':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:22:43 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
457d7bb5ab -s ours
* commit '
457d7bb5abec387076c5c28438a4ecca7bc95bd4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:07:42 +0000 (18:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 18:07:12 +0000 (18:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 18:01:40 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
9e30c4b406 -s ours
* commit '
9e30c4b4062296bd1eb918d20b6f28032644d820':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 18:00:18 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
6e66ac8e66 -s ours
* commit '
6e66ac8e6624d818ce8675ecc74b05452103bb22':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:58:36 +0000 (17:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
7c6d61e8eb -s ours
* commit '
7c6d61e8eb9bfb27a038f48d2719c87bd6022e79':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:56:23 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 17:55:04 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 17:52:10 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Jeff Sharkey [Wed, 21 Oct 2015 16:59:55 +0000 (09:59 -0700)]
Narrow permission re-granting to specific volume.
When mounting a storage volume after an SDK upgrade, the platform
grants install permissions requested by apps. This patch fixes a
bug that was causing us to re-grant permissions for all installed
apps; we now narrow the granting to just the storage volume of
interest.
Also fixes a bug where scanning of internal ASECs would bump the
VersionInfo of the legacy apps-on-SD volume.
There is still a bug here around internal ASECs not being considered
for re-grants, but that needs to be fixed in a more invasive CL that
creates a separate VersionInfo. In addition, internal ASECs (also
known as forward locked apps) have been deprecated for some time.
Bug:
24583803
Change-Id: I9115fd484ec083bc10a970f5f612860d5a53e520
Geoff Mendal [Wed, 21 Oct 2015 17:19:50 +0000 (10:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4be0631da01ad34daf596e7634630fbd2efae90e
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 17:16:37 +0000 (10:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I167d766a2f76a3b6b4b121abddf1f874103a378a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 17:07:21 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
a73a642bfe -s ours
* commit '
a73a642bfedd0a2fe0854329081354869bf70039':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:06:27 +0000 (17:06 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
Geoff Mendal [Wed, 21 Oct 2015 17:06:03 +0000 (17:06 +0000)]
Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
am:
84ab40cab2
* commit '
84ab40cab243ac76a83c3d15478699998ba68236':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:05:16 +0000 (17:05 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
Geoff Mendal [Wed, 21 Oct 2015 17:04:43 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8ba1cdd946 -s ours
am:
762ce0fc44 -s ours
* commit '
762ce0fc448ebd41225ef0600fb5d258de434de7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:04:18 +0000 (17:04 +0000)]
Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
am:
84ab40cab2
* commit '
84ab40cab243ac76a83c3d15478699998ba68236':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:04:07 +0000 (17:04 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
Geoff Mendal [Wed, 21 Oct 2015 17:03:57 +0000 (10:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4b7d4378ff46c26fa5da8449fca10274beef157
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 17:03:40 +0000 (17:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
7f174ff665 -s ours
* commit '
7f174ff6653154c4f1c3b184c402e92a4f53b7dd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:02:59 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8ba1cdd946 -s ours
am:
762ce0fc44 -s ours
* commit '
762ce0fc448ebd41225ef0600fb5d258de434de7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:02:06 +0000 (17:02 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
Geoff Mendal [Wed, 21 Oct 2015 17:01:41 +0000 (17:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
55bc169d50 -s ours
* commit '
55bc169d5094ef1faf1cdca6c9952f29c7189d9d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:00:53 +0000 (17:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
7f174ff665 -s ours
* commit '
7f174ff6653154c4f1c3b184c402e92a4f53b7dd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 17:00:28 +0000 (10:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6766fce7213a69ce3e08ce5de869714b89e62adf
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:58:59 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
55bc169d50 -s ours
* commit '
55bc169d5094ef1faf1cdca6c9952f29c7189d9d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 16:57:46 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
721249f22b -s ours
* commit '
721249f22b11b45ff26045cc7c718334a12b7400':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 16:56:57 +0000 (09:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: If77b4f540cb80ac3d88c56d043069c4fd890b81a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:55:59 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
04733e23a3 -s ours
* commit '
04733e23a316cfec96e195d05235e57b13439454':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 16:54:33 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
cd000a2228 -s ours
* commit '
cd000a22282cea343b9265ab63b4e316fca64925':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 16:53:03 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
b8f70e10ef -s ours
* commit '
b8f70e10efc2199f383611e3d82f2f1d721d53fc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 16:51:34 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:48:43 +0000 (09:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie451c3262cd6073b9cbf71ab8d0bc38ad212b0c4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:47:40 +0000 (16:47 +0000)]
Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:47:13 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
8ba1cdd946 -s ours
* commit '
8ba1cdd9464b88375755e1976e4ee0f5620ff5be':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 16:45:48 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:45:23 +0000 (09:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib804ad4db26e8029d8c55ccda9046273baf93de3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:44:33 +0000 (16:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:44:08 +0000 (16:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:43:45 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:43:21 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:42:29 +0000 (16:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:42:17 +0000 (09:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ee163f9a6b6bc4150c8661f3087385b5415dd0b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:42:08 +0000 (16:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 21 Oct 2015 16:39:56 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 21 Oct 2015 16:39:05 +0000 (09:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I74489702454570e28841759451b47d7381dcf8c7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:37:21 +0000 (11:37 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ie94144993d7f959cf30eaeba12ef9a86a92bb48d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:35:36 +0000 (09:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2dfb95a393fe97360dc2fff6f849c727cb6a180b
Auto-generated-cl: translation import
Andrei Stingaceanu [Wed, 21 Oct 2015 16:33:28 +0000 (16:33 +0000)]
Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am:
ee4ab0a55b
am:
24fc647e70
* commit '
24fc647e70af950dbe671e9a709da8f97b2ba216':
Fix toolbar flickering in ExtractedMode when longpressing.
Geoff Mendal [Wed, 21 Oct 2015 16:32:22 +0000 (09:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaef98e762ece5d69ed668ca83daecc0273197bf4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:29:09 +0000 (09:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id94c0578c377d92e038affd93bf25a07b22e9d7d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Oct 2015 16:24:14 +0000 (11:24 -0500)]
Import translations. DO NOT MERGE
Change-Id: Iafe3e615aa33308b7fb6e2b71df40e190371b7f3
Auto-generated-cl: translation import
Andrei Stingaceanu [Wed, 21 Oct 2015 16:03:52 +0000 (16:03 +0000)]
Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev
am:
ee4ab0a55b
* commit '
ee4ab0a55b355b21168de0eb5615f2e321c2982f':
Fix toolbar flickering in ExtractedMode when longpressing.
Andrei Stingaceanu [Wed, 21 Oct 2015 15:56:26 +0000 (15:56 +0000)]
Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev
Paul Lawrence [Wed, 21 Oct 2015 15:04:17 +0000 (15:04 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
Paul Lawrence [Wed, 21 Oct 2015 15:03:54 +0000 (15:03 +0000)]
Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
am:
8deb694779
* commit '
8deb6947795426a3379c7487ac3aeb6cdce5e58d':
Paul Lawrence [Wed, 21 Oct 2015 15:02:13 +0000 (15:02 +0000)]
Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
am:
8deb694779
* commit '
8deb6947795426a3379c7487ac3aeb6cdce5e58d':
Paul Lawrence [Wed, 21 Oct 2015 15:00:58 +0000 (15:00 +0000)]
Merge "Don\'t include password on default encryption command" into mnc-dr-dev am:
68521fd7ce
am:
29c5fb2646
* commit '
29c5fb2646dd0bc0f2fa8b3b98f0893d7d57469b':
Don't include password on default encryption command
Geoff Mendal [Wed, 21 Oct 2015 14:59:34 +0000 (14:59 +0000)]
Import translations. DO NOT MERGE am:
fde4111eea -s ours
am:
c37fe84736 -s ours
* commit '
c37fe847361b91dcabe47673a9145b7f7b52fb51':
Import translations. DO NOT MERGE
OSDN Git Service
