drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
270,261 Commits 1 Branch 0 Tags
Commit Graph

270261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
d57985ed32 Import translations. DO NOT MERGE am: 4fd35e0578 -s ours 
am: f46f825edd  -s ours

Change-Id: Id38db8cc05b29eb499ee66798a359470a67c7d92
 2016-09-07 12:27:16 +00:00
Bill Yi
0e71f1195b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c906d9dc72 -s ours 
am: b77af8caca  -s ours

Change-Id: Ic877cdaafc996cebb2b1919ed8d1d266714a7f65
 2016-09-07 12:27:11 +00:00
Bill Yi
7e4d95e7a9 Import translations. DO NOT MERGE am: ac7ee28cd0 -s ours 
am: 052dce27c9  -s ours

Change-Id: I69c864a30b81b4ed4d06a7dc8b649d1b65cdee35
 2016-09-07 12:27:07 +00:00
Bill Yi
ca265b8910 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bdc26bab6e -s ours 
am: 142b734458  -s ours

Change-Id: I4bf7445c7aa305954115b7ef2ab493113861d7aa
 2016-09-07 12:27:03 +00:00
Bill Yi
fb653868d4 Import translations. DO NOT MERGE am: 7c4d3912f3 -s ours 
am: 2a66c5bd84  -s ours

Change-Id: I201e92711adc46ac6dd88f1d871b06979addc59b
 2016-09-07 12:26:58 +00:00
Bill Yi
ddad1247bd Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 90cfa629cf  -s ours

Change-Id: I8d71e07e06e8ae7b4cd5914786c2d61577f14e52
 2016-09-07 12:19:25 +00:00
Bill Yi
ffd768ee8e Import translations. DO NOT MERGE 
am: cf35085cfd  -s ours

Change-Id: I9ecdf85922fd8102cfd03589b0ee3656eb5bc708
 2016-09-07 12:19:22 +00:00
Bill Yi
f46f825edd Import translations. DO NOT MERGE 
am: 4fd35e0578  -s ours

Change-Id: Ic02d9837575237d253b2dd9693f8b7c27f1238ac
 2016-09-07 12:14:25 +00:00
Bill Yi
b77af8caca Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: c906d9dc72  -s ours

Change-Id: I428f022461de19aa0e3190884387deb819938e0b
 2016-09-07 12:14:22 +00:00
Bill Yi
052dce27c9 Import translations. DO NOT MERGE 
am: ac7ee28cd0  -s ours

Change-Id: I81c59605726c68259d1a49e39a29040ce40e2f64
 2016-09-07 12:14:20 +00:00
Bill Yi
142b734458 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: bdc26bab6e  -s ours

Change-Id: I395316ebe79ee829b3538c7167be18a517f782c8
 2016-09-07 12:14:15 +00:00
Bill Yi
2a66c5bd84 Import translations. DO NOT MERGE 
am: 7c4d3912f3  -s ours

Change-Id: Iba0ae68b665da9e415db251702fd6478f5a7427a
 2016-09-07 12:14:13 +00:00
Bill Yi
8fa7d214ae Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 29ccfe7066  -s ours

Change-Id: Ic87bbd0ad342f02b9b89f7460f95785479182cce
 2016-09-07 12:13:43 +00:00
Bill Yi
5f97046f24 Import translations. DO NOT MERGE 
am: 057353bbf7  -s ours

Change-Id: I968f2c50e110a8fed1636e4a52bf978daa41be6e
 2016-09-07 12:13:39 +00:00
TreeHugger Robot
90cfa629cf Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-07 12:07:46 +00:00
TreeHugger Robot
29ccfe7066 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-07 12:07:06 +00:00
TreeHugger Robot
c906d9dc72 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-07 12:05:53 +00:00
TreeHugger Robot
bdc26bab6e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-07 12:00:30 +00:00
Yohann Roussel
61f65393b2 Merge "Add a test app for suppressed exceptions" am: 15c6078f4d am: 166ab31073 
am: fceccd226b

Change-Id: Ibdef03d5f21190900a49bf404d4645a8a1f2a1b6
 2016-09-07 10:12:46 +00:00
Yohann Roussel
fceccd226b Merge "Add a test app for suppressed exceptions" am: 15c6078f4d 
am: 166ab31073

Change-Id: Icff43af8769359b3cc97653182831466a02b0c8f
 2016-09-07 10:08:16 +00:00
Yohann Roussel
166ab31073 Merge "Add a test app for suppressed exceptions" 
am: 15c6078f4d

Change-Id: I45692cdf5081fe848935075d861fad11e68d19ba
 2016-09-07 10:03:08 +00:00
Bill Yi
7c4d3912f3 Import translations. DO NOT MERGE 
Change-Id: I7ee34b9c13e6c4d8919c5eae201954561a8e6cba
Auto-generated-cl: translation import
 2016-09-07 02:53:53 -07:00
Yohann Roussel
15c6078f4d Merge "Add a test app for suppressed exceptions" 2016-09-07 09:52:50 +00:00
Bill Yi
4fd35e0578 Import translations. DO NOT MERGE 
Change-Id: I2541b36722c5142046760d243c27929c46c4ec42
Auto-generated-cl: translation import
 2016-09-07 00:01:44 -07:00
Bill Yi
ac7ee28cd0 Import translations. DO NOT MERGE 
Change-Id: I911f2d59dcaefe83da01e18160b9ab905a9a96b0
Auto-generated-cl: translation import
 2016-09-06 23:53:36 -07:00
Bill Yi
9125f16353 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2c0df72ff6 -s ours 
am: e566e3ec43  -s ours

Change-Id: I209ec6b46cf1d1e9133b05096e1b73cf38efef8e
 2016-09-07 05:00:01 +00:00
Bill Yi
36286e0519 Import translations. DO NOT MERGE am: dd0e168ca5 -s ours 
am: 70643782e2  -s ours

Change-Id: I8413a0dbbb02b0e45f004f762dc5a75d60acf4f5
 2016-09-07 04:59:53 +00:00
Bill Yi
e566e3ec43 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 2c0df72ff6  -s ours

Change-Id: Id1c20a489505992dff768f5d29399262f047ca3a
 2016-09-07 04:54:59 +00:00
Bill Yi
70643782e2 Import translations. DO NOT MERGE 
am: dd0e168ca5  -s ours

Change-Id: I18ed5d0b8b6c1169a3c552fb817334b227c7732d
 2016-09-07 04:54:58 +00:00
TreeHugger Robot
2c0df72ff6 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-07 04:47:37 +00:00
Etan Cohen
594b71ca62 Merge changes from topic 'enable_nan' am: 62419a0138 am: 20d6e886a7 
am: 6e318896ea

Change-Id: I5e5057b4e5ea146d133b4cea22602ff6650f29e6
 2016-09-07 04:46:38 +00:00
Etan Cohen
6e318896ea Merge changes from topic 'enable_nan' am: 62419a0138 
am: 20d6e886a7

Change-Id: I57da3187f0373aa45b8bac0786c34e80c87cef6c
 2016-09-07 04:40:27 +00:00
Lorenzo Colitti
42a5b34196 Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] am: 4171cdf303 -s ours am: 8b8bef622a -s ours 
am: 36f0dc6271

Change-Id: I01e6be4e2a01f613ae6676dbc451f1e1fc1898c0
 2016-09-07 04:38:43 +00:00
Etan Cohen
826ba669c7 [NAN] Add transport type for NAN. [DO NOT MERGE] am: bd9fdbe022 -s ours am: e3efe944fd -s ours 
am: 481a9c73da

Change-Id: Ie40c480b45fcb5a660335eb42a71afcf8a8cebb5
 2016-09-07 04:38:37 +00:00
Lorenzo Colitti
36f0dc6271 Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] am: 4171cdf303 -s ours 
am: 8b8bef622a  -s ours

Change-Id: Id410b4653b3314766eac6b185577cc7708e0823b
 2016-09-07 04:33:24 +00:00
Etan Cohen
20d6e886a7 Merge changes from topic 'enable_nan' 
am: 62419a0138

Change-Id: I98abd87843ed3f2fde6c5b1fe1234563e03e0216
 2016-09-07 04:33:23 +00:00
Etan Cohen
481a9c73da [NAN] Add transport type for NAN. [DO NOT MERGE] am: bd9fdbe022 -s ours 
am: e3efe944fd  -s ours

Change-Id: I439ed5ac5b70f6e693a441d8b6000f208351a3f7
 2016-09-07 04:33:21 +00:00
Lorenzo Colitti
8b8bef622a Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] 
am: 4171cdf303  -s ours

Change-Id: I2d3f4c4b11ba2a39649c7747fbe1cee1ff16f198
 2016-09-07 04:28:21 +00:00
Etan Cohen
e3efe944fd [NAN] Add transport type for NAN. [DO NOT MERGE] 
am: bd9fdbe022  -s ours

Change-Id: I5b313eda3f872b9938b0092d4fc197e5af8ac8b7
 2016-09-07 04:27:28 +00:00
Etan Cohen
62419a0138 Merge changes from topic 'enable_nan' 
* changes:
  Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
  [NAN] Add transport type for NAN. [DO NOT MERGE]
 2016-09-07 04:19:52 +00:00
Bill Yi
057353bbf7 Import translations. DO NOT MERGE 
Change-Id: I14a51d12218de5eef75f5db8fd99838bb749b750
Auto-generated-cl: translation import
 2016-09-06 18:26:24 -07:00
Bill Yi
cf35085cfd Import translations. DO NOT MERGE 
Change-Id: If9d5c40eada1c5a4a530ddd1d75e7ae6f7d7ecb8
Auto-generated-cl: translation import
 2016-09-06 18:18:50 -07:00
Roshan Pius
d74f710e25 Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0 am: e597198f12 
am: 478bb2b44d

Change-Id: I4981990a4dc3aa1dde70625b93798a2fd6ff8263
 2016-09-06 23:21:41 +00:00
Mathieu Chartier
c49450e536 Merge "Avoid profile guided compilation for vmSafeMode" am: a817838e8b am: 7554be1e36 
am: e65bf6d173

Change-Id: If800f4ea170dce4c3c3a478305b990748de3139e
 2016-09-06 23:15:04 +00:00
Roshan Pius
478bb2b44d Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0 
am: e597198f12

Change-Id: I3a1f7808a4ce44f96753cb875ff914985151b208
 2016-09-06 23:12:01 +00:00
Android Build Merger (Role)
a68fda1ac8 Merge "Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012 am: 130cb9232a am: b24828bd77" into nyc-mr1-dev-plus-aosp 2016-09-06 23:11:18 +00:00
Android Build Merger (Role)
aee547867d Merge "Merge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e" into nyc-dev-plus-aosp am: 9c6e51be17" into nyc-mr1-dev-plus-aosp 2016-09-06 23:11:09 +00:00
Android Build Merger (Role)
451b0667da Merge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e am: 202e00bec0" into nyc-mr1-dev-plus-aosp 2016-09-06 23:10:54 +00:00
Android Build Merger (Role)
288f5a3572 Merge "Merge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc" into nyc-dev-plus-aosp am: c4f7166e19" into nyc-mr1-dev-plus-aosp 2016-09-06 23:10:45 +00:00
Android Build Merger (Role)
06022f9a8c Merge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc am: 893fbf87dc" into nyc-mr1-dev-plus-aosp 2016-09-06 23:10:36 +00:00