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

117165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
fd79664ca9 am e6cc525f: (-s ours) am b43e0ead: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'e6cc525f45e6856a1344a5a21ca119748f7bf84f':
  Import translations. DO NOT MERGE
 2013-10-14 10:49:18 -07:00
Baligh Uddin
ad5e2b85cf am e3e194ae: (-s ours) am 8cdfa5cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'e3e194ae8bd3ad269f0524f24f4b913b0dd6eb6b':
  Import translations. DO NOT MERGE
 2013-10-14 10:49:14 -07:00
Baligh Uddin
a80aa9e07a am 9f93c67c: (-s ours) am adb1b5b4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '9f93c67c6ae56894b0ca8ccc6b55c6ff239ff3f3':
  Import translations. DO NOT MERGE
 2013-10-14 10:49:11 -07:00
Baligh Uddin
fe5f12b8e9 am b780082c: (-s ours) am 4bb81ac8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'b780082cf3372f0e44ffbd7ce2a5b17ebf05a39b':
  Import translations. DO NOT MERGE
 2013-10-14 10:49:08 -07:00
Svetoslav
58a22cdf29 am 455e95eb: am 1f5c1f3e: am 036f05b8: Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev 
* commit '455e95ebab93c1d5c692114186807a058b454d73':
  Putting the cursor at the end of the copies and range inputs.
 2013-10-14 10:49:05 -07:00
Chris Craik
37c4687190 am e0db6fc6: am 8d56f667: am 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev 
* commit 'e0db6fc6847f0404b704c179d4795b27d9025693':
  Document special case in hasOverlappingRendering
 2013-10-14 10:48:57 -07:00
Jim Miller
a2319d1210 am 4f2bcde9: am 51f2d8ef: am 11def8f0: Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev 
* commit '4f2bcde9db26523fd7c048be1b502f12328ee60c':
  Delay all widget additions in keyguard until after boot completes
 2013-10-14 10:48:30 -07:00
Jeff Sharkey
ad9739cdbe am 5f7f97e0: am 2dbe1627: am 12ad9ce2: Merge "Fix spelling." into klp-dev 
* commit '5f7f97e01507c6d5860388dfea860e05c2a3616e':
  Fix spelling.
 2013-10-14 10:48:23 -07:00
Svetoslav
0983f49eff am 00040103: am 8e80d1f9: am 33021d95: Merge "Adding timeout if the current printer or its capabilities disappear." into klp-dev 
* commit '0004010369ef713ae9bdbdeb8e16bfbdcd835811':
  Adding timeout if the current printer or its capabilities disappear.
 2013-10-14 10:48:19 -07:00
Matthew Williams
d08d6686c5 resolved conflicts for merge of 94b51810 to master 
Change-Id: Ida818f066b66c356a84c80e5eab0a4e2cf4ebd49
 2013-10-14 10:39:41 -07:00
Baligh Uddin
8f7b859a7d Merge "Import translations. DO NOT MERGE" 2013-10-14 16:22:55 +00:00
Baligh Uddin
7d8b77f036 Import translations. DO NOT MERGE 
Change-Id: Ib9ba58f8e1486581d71443234db99a12f925cf0a
Auto-generated-cl: translation import
 2013-10-14 09:17:56 -07:00
Baligh Uddin
7967b0c141 Merge "Import translations. DO NOT MERGE" 2013-10-14 16:15:14 +00:00
Baligh Uddin
11bb67d6c2 Import translations. DO NOT MERGE 
Change-Id: Ib34e81399bfc7c5867fcc060af7d5487485a2855
Auto-generated-cl: translation import
 2013-10-14 09:13:55 -07:00
Baligh Uddin
0da3dea90c Import translations. DO NOT MERGE 
Change-Id: I734c073236b4d50576d962b23f4b50abfccec16e
Auto-generated-cl: translation import
 2013-10-14 09:12:27 -07:00
Narayan Kamath
12b28ce4e8 Fix minor thread corectness issue in NetworkInfo 
Hold the right lock while copying info from another
NetworkInfo object to prevent changes being made to it
while the copy is in progress.

Change-Id: I1aa2c29e81e045b0359f957352c438e79e692823
 2013-10-14 09:07:40 +00:00
Baligh Uddin
e6cc525f45 am b43e0ead: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'b43e0eadbe144eae189ecf9f26005fd76d9f31d6':
  Import translations. DO NOT MERGE
 2013-10-11 17:30:31 -07:00
Baligh Uddin
e3e194ae8b am 8cdfa5cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '8cdfa5cd18ecf552f99c826797951a9a86c2af3c':
  Import translations. DO NOT MERGE
 2013-10-11 17:30:28 -07:00
Baligh Uddin
9f93c67c6a am adb1b5b4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'adb1b5b43f517751151835e2143d53ad3666ac8e':
  Import translations. DO NOT MERGE
 2013-10-11 17:30:25 -07:00
Baligh Uddin
b780082cf3 am 4bb81ac8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '4bb81ac838dd910ea4a8dded676d70d4e399eed9':
  Import translations. DO NOT MERGE
 2013-10-11 17:30:23 -07:00
Baligh Uddin
b43e0eadbe Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-12 00:27:48 +00:00
Baligh Uddin
849a41a865 Merge "Import translations. DO NOT MERGE" 2013-10-12 00:27:35 +00:00
Baligh Uddin
8cdfa5cd18 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-12 00:27:30 +00:00
Baligh Uddin
1f90779654 Merge "Import translations. DO NOT MERGE" 2013-10-12 00:27:02 +00:00
Baligh Uddin
adb1b5b43f Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-12 00:26:49 +00:00
Svetoslav
455e95ebab am 1f5c1f3e: am 036f05b8: Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev 
* commit '1f5c1f3eee2df06ae42bc9e2bb9b5502316502cc':
  Putting the cursor at the end of the copies and range inputs.
 2013-10-11 17:26:42 -07:00
Baligh Uddin
4bb81ac838 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-12 00:26:28 +00:00
Svetoslav
1f5c1f3eee am 036f05b8: Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev 
* commit '036f05b8b0dabc72e6ce68372516c3d98da137e4':
  Putting the cursor at the end of the copies and range inputs.
 2013-10-11 17:22:56 -07:00
Svetoslav
036f05b8b0 Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev 2013-10-12 00:21:12 +00:00
Chris Craik
e0db6fc684 am 8d56f667: am 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev 
* commit '8d56f667243292ed002dce81498be0e4d4a3ea59':
  Document special case in hasOverlappingRendering
 2013-10-11 17:14:12 -07:00
Chris Craik
8d56f66724 am 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev 
* commit '709129ba939f9d09887506540bcbb573086b3f15':
  Document special case in hasOverlappingRendering
 2013-10-11 17:11:18 -07:00
Chris Craik
709129ba93 Merge "Document special case in hasOverlappingRendering" into klp-dev 2013-10-12 00:08:08 +00:00
Svetoslav
89ed9fcf9b Putting the cursor at the end of the copies and range inputs. 
bug:10983508

Change-Id: I767876fada2f28b00283ed9140fca1a40729f38f
 2013-10-11 17:04:34 -07:00
Chris Craik
c09127a7c3 Document special case in hasOverlappingRendering 
bug:11121809

Change-Id: I074ac47aa510bd2362cfda7dffc73930f07e925c
 2013-10-11 17:00:16 -07:00
Baligh Uddin
f27bbdd594 Import translations. DO NOT MERGE 
Change-Id: I2b2abc0ab598637d4762135082fc79c7205c332f
Auto-generated-cl: translation import
 2013-10-11 16:45:22 -07:00
Baligh Uddin
b48966885e Import translations. DO NOT MERGE 
Change-Id: I11e36ca2c03ecbe1a6c99a8cc4f7e4afed3e5427
Auto-generated-cl: translation import
 2013-10-11 16:34:38 -07:00
Baligh Uddin
0c679b02b3 Import translations. DO NOT MERGE 
Change-Id: I68d6709509ea86f19862bb7ea5319d405dcd7c10
Auto-generated-cl: translation import
 2013-10-11 16:33:07 -07:00
Baligh Uddin
e9fe9d729e Import translations. DO NOT MERGE 
Change-Id: I82d4f166b346b10babd67f89f3035426e74db7dd
Auto-generated-cl: translation import
 2013-10-11 16:28:01 -07:00
Baligh Uddin
40311938ae Import translations. DO NOT MERGE 
Change-Id: If2d70b403a7c4ba6b6023b71bf1d66e01575278d
Auto-generated-cl: translation import
 2013-10-11 16:27:10 -07:00
Baligh Uddin
b8087da933 Import translations. DO NOT MERGE 
Change-Id: I289f527bef7c4274b4161d2e90c8aa82dc9608a9
Auto-generated-cl: translation import
 2013-10-11 16:23:01 -07:00
Baligh Uddin
984c826f59 Import translations. DO NOT MERGE 
Change-Id: I55d4cf3dec38ad38792f855335c9fe9d2cc4624d
Auto-generated-cl: translation import
 2013-10-11 16:22:18 -07:00
Jim Miller
4f2bcde9db am 51f2d8ef: am 11def8f0: Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev 
* commit '51f2d8ef9da5008dda4b99157774327ed9138ab8':
  Delay all widget additions in keyguard until after boot completes
 2013-10-11 14:43:55 -07:00
Jim Miller
51f2d8ef9d am 11def8f0: Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev 
* commit '11def8f06a3c03a0056e9fa010b28622d9d88d2b':
  Delay all widget additions in keyguard until after boot completes
 2013-10-11 14:40:57 -07:00
Jim Miller
11def8f06a Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev 2013-10-11 21:38:05 +00:00
Jeff Sharkey
5f7f97e015 am 2dbe1627: am 12ad9ce2: Merge "Fix spelling." into klp-dev 
* commit '2dbe16277daab31c62a1dc63dbb6768eb1b407a8':
  Fix spelling.
 2013-10-11 14:36:59 -07:00
Svetoslav
0004010369 am 8e80d1f9: am 33021d95: Merge "Adding timeout if the current printer or its capabilities disappear." into klp-dev 
* commit '8e80d1f953932ad867ff4f0b23b466565f1b15f0':
  Adding timeout if the current printer or its capabilities disappear.
 2013-10-11 14:36:56 -07:00
Matthew Williams
94b518101c am e0a2bdaf: am 32551ae5: Merge "Fix infinite boot-loop bug in SM." into klp-dev 
* commit 'e0a2bdaf61a7a72e92d614f81f86e7fd441b38e4':
  Fix infinite boot-loop bug in SM.
 2013-10-11 14:33:18 -07:00
Jeff Sharkey
2dbe16277d am 12ad9ce2: Merge "Fix spelling." into klp-dev 
* commit '12ad9ce23e1d1fd07c07e683c191e6bc028c4407':
  Fix spelling.
 2013-10-11 14:33:03 -07:00
Svetoslav
8e80d1f953 am 33021d95: Merge "Adding timeout if the current printer or its capabilities disappear." into klp-dev 
* commit '33021d95a8f3ca127c1df6aeb54c3a9219f46093':
  Adding timeout if the current printer or its capabilities disappear.
 2013-10-11 14:32:59 -07:00
Jeff Sharkey
12ad9ce23e Merge "Fix spelling." into klp-dev 2013-10-11 21:30:54 +00:00