Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,068 Commits 3 Branches 0 Tags
3a64032fe6ed77b8a9bf45c2bb2ce1fc436a0ab9
Commit Graph

170068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanket Padawe
3a64032fe6 am 8e1b08ac: am b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev 
* commit '8e1b08ac261324f85f53ce2991df83ef53dfd2bf':
  Call entitlement on clicking tethering tile in quick settings.
 2014-12-03 20:25:24 +00:00
Jason Sams
5f9e59b229 am e4c82550: (-s ours) am d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev 
* commit 'e4c825507dfcb2559ecf6401d06fa5a7ecc8e721':
  Fix bug in passing of context flags and version.
 2014-12-03 20:25:19 +00:00
Baligh Uddin
8b2db65f1b am ee549e51: (-s ours) am 0fcd3f41: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ee549e515eedb86ff29917f2c8760b665e30d1ee':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:57 +00:00
Baligh Uddin
1686b5c3f5 am 70b44364: (-s ours) am 925c27be: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '70b44364a1a0c7d6879670ead2fcbc7be02ec7f8':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:51 +00:00
Baligh Uddin
842556a450 am 204f2628: (-s ours) am 91426aa2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '204f26284cab010913829c412d39c7eee576080f':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:46 +00:00
Baligh Uddin
13b560996a am eb0fdf48: (-s ours) am ed338377: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'eb0fdf48b75c567666676bb0b01ae098ab471407':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:41 +00:00
Baligh Uddin
1348bad207 am c64e49ad: (-s ours) am 51bca143: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c64e49adcab9b9f7680eeef8d33e18c30bda54c0':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:36 +00:00
Baligh Uddin
24c6982de4 am a221d299: (-s ours) am d33f84eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'a221d299c0f9a6ec82daf91bcd7ac739eefe653a':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:31 +00:00
Baligh Uddin
d82f08196b am 42f0a843: (-s ours) am fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '42f0a8434636497737dae01db719908cc45910e4':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:26 +00:00
Michael Wright
eb26c8ee2a am 4de2ab4c: am 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev 
* commit '4de2ab4c55f74a7e166f58c7b7e72fc47c0d24c1':
  Correctly iterate through MediaProjection callbacks.
 2014-12-03 07:56:20 +00:00
Alan Viverette
4483f4611e am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev 
* commit 'bb241c3cdedb96d2a3a61e913102d6186f12103a':
  Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
 2014-12-03 07:56:12 +00:00
Dan Sandler
e43bab74bc am 29f89da0: am dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev 
* commit '29f89da0a8a38dd060c8bd277d7473ccc3843185':
  Turn off DEBUG_GESTURES
 2014-12-03 07:56:07 +00:00
George Mount
a3a53251f1 am 24fac506: am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 
* commit '24fac506f0204433aa3d2314d3ac7f909b6eb67a':
  Keep snapshot order matching the shared elements.
 2014-12-03 07:56:00 +00:00
Sanket Padawe
8e1b08ac26 am b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev 
* commit 'b13c12f58db3026ad30849873b3b6fc664f5ce7b':
  Call entitlement on clicking tethering tile in quick settings.
 2014-12-03 02:19:06 +00:00
Jason Sams
e4c825507d am d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev 
* commit 'd6e9e61c9d9b7ba88ae7ade0418e17a3ac2ef341':
  Fix bug in passing of context flags and version.
 2014-12-03 02:19:00 +00:00
Baligh Uddin
ee549e515e am 0fcd3f41: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '0fcd3f41079880abccf08c498b5e109dccfc4577':
  Import translations. DO NOT MERGE
 2014-12-03 02:18:55 +00:00
Baligh Uddin
70b44364a1 am 925c27be: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '925c27bef875f20f4b34254c588296f10fc5fe5a':
  Import translations. DO NOT MERGE
 2014-12-03 02:18:50 +00:00
Baligh Uddin
204f26284c am 91426aa2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '91426aa292455aef968e112c2255dd676f7f1ec6':
  Import translations. DO NOT MERGE
 2014-12-03 02:18:45 +00:00
Baligh Uddin
eb0fdf48b7 am ed338377: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ed3383770e77b88ab0692bee9acef8d78b2cc7a2':
  Import translations. DO NOT MERGE
 2014-12-03 02:18:40 +00:00
Baligh Uddin
c64e49adca am 51bca143: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '51bca143862c568507206adf119c9003a4f3f764':
  Import translations. DO NOT MERGE
 2014-12-03 02:18:35 +00:00
Baligh Uddin
a221d299c0 am d33f84eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd33f84eb3e20b781e433d93165d9ff83434d5c99':
  Import translations. DO NOT MERGE
 2014-12-03 02:18:30 +00:00
Baligh Uddin
42f0a84346 am fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'fccb3b43a9dfe4dfd3d03119e37b2c99fc95042c':
  Import translations. DO NOT MERGE
 2014-12-03 02:18:24 +00:00
Michael Wright
4de2ab4c55 am 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev 
* commit '7081a5d1ae6b9fe5d92dca25a85524c2c2421e1e':
  Correctly iterate through MediaProjection callbacks.
 2014-12-03 02:18:19 +00:00
Alan Viverette
bb241c3cde am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev 
* commit '4eb2e04f4d3eafdf56840a0988dd730dc433478d':
  Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
 2014-12-03 02:18:12 +00:00
Dan Sandler
29f89da0a8 am dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev 
* commit 'dfb39ce332d4256363d1c2a47e68eecd5f144edc':
  Turn off DEBUG_GESTURES
 2014-12-03 02:18:06 +00:00
George Mount
24fac506f0 am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 
* commit '561261d4442fb78b314c00f6b836fe7b1c387977':
  Keep snapshot order matching the shared elements.
 2014-12-03 02:17:58 +00:00
Sanket Padawe
b13c12f58d Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev 2014-12-03 01:33:43 +00:00
Jason Sams
d6e9e61c9d Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev 2014-12-03 01:27:37 +00:00
Baligh Uddin
0fcd3f4107 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-03 01:26:17 +00:00
Baligh Uddin
925c27bef8 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-03 01:25:55 +00:00
Baligh Uddin
91426aa292 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-03 01:25:37 +00:00
Baligh Uddin
ed3383770e Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-03 01:25:17 +00:00
Baligh Uddin
51bca14386 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-03 01:24:57 +00:00
Baligh Uddin
d33f84eb3e Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-03 01:24:40 +00:00
Baligh Uddin
fccb3b43a9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-03 01:24:34 +00:00
Jason Sams
bb7e86ff04 Fix bug in passing of context flags and version. 
bug 18592099

Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
 2014-12-02 17:24:17 -08:00
Michael Wright
7081a5d1ae Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev 2014-12-03 01:14:22 +00:00
Baligh Uddin
5950a91371 Import translations. DO NOT MERGE 
Change-Id: Ia2ccce90103cdc5e6b3814d50394e9c81e38010d
Auto-generated-cl: translation import
 2014-12-02 16:50:24 -08:00
Baligh Uddin
18e71a31a2 Import translations. DO NOT MERGE 
Change-Id: I32d37766e97752a7f9479cdf933470978ca3f616
Auto-generated-cl: translation import
 2014-12-02 16:47:06 -08:00
Baligh Uddin
053b538ab2 Import translations. DO NOT MERGE 
Change-Id: Id585c5bed5366430b476445a1806748894dd34ac
Auto-generated-cl: translation import
 2014-12-02 16:45:14 -08:00
Alan Viverette
4eb2e04f4d Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev 2014-12-03 00:43:47 +00:00
Baligh Uddin
44ed3c1148 Import translations. DO NOT MERGE 
Change-Id: I7224417957b74eabb5e828d94ad11d89738f1724
Auto-generated-cl: translation import
 2014-12-02 16:37:24 -08:00
Baligh Uddin
3e801388ad Import translations. DO NOT MERGE 
Change-Id: I6d028c94d3ac7df54925008e3cd71973aa9254c9
Auto-generated-cl: translation import
 2014-12-02 16:32:15 -08:00
Baligh Uddin
c3a2ea95e6 Import translations. DO NOT MERGE 
Change-Id: I91311501af2edb114e6db77786fcefaa6d26db3a
Auto-generated-cl: translation import
 2014-12-02 16:30:05 -08:00
Baligh Uddin
1540fd9cc5 Import translations. DO NOT MERGE 
Change-Id: I5615709624d61d837bd562cc5bb4c454ef983527
Auto-generated-cl: translation import
 2014-12-02 16:28:12 -08:00
Alan Viverette
9752428dc1 Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting 
Using CURRENT isn't always safe.

BUG: 18557273
Change-Id: I12e197ab25b8ffdc04c5e74836945177870698a2
 2014-12-02 16:24:24 -08:00
Dan Sandler
dfb39ce332 Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev 2014-12-03 00:22:19 +00:00
George Mount
561261d444 Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 2014-12-03 00:13:28 +00:00
Adam Lesinski
3550c6c5d6 am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev 
* commit 'f17611a29e3b0d0c7a5d28a1ce92682a2c097de6':
  AAPT: Add custom transition classes to Proguard keep set
 2014-12-03 00:05:33 +00:00
Jason Sams
233d700efc am b940599a: am abdaa32d: Merge "Fix bug in passing of context flags and version." 
* commit 'b940599a750e3ee50934c57b6a22841627be2d2e':
  Fix bug in passing of context flags and version.
 2014-12-03 00:00:21 +00:00