Chris Craik
815fbbdfca
am 7ff37ada: am ff2c22e2: Merge "Move functor GL setup to just before functor" into klp-dev
...
* commit '7ff37ada138d9023e9d646f7195ae761a7b83ff2':
Move functor GL setup to just before functor
2013-08-26 15:12:06 -07:00
Alan Viverette
84ba33acf9
am b1986354: am aad44178: Merge "Use transient state to preserve accessibility focus in ListView" into klp-dev
...
* commit 'b19863545ddf5f071926869d92aeb9aa38f2f857':
Use transient state to preserve accessibility focus in ListView
2013-08-26 15:12:03 -07:00
Alan Viverette
4425a3d250
am 37eb3034: am faf7a208: Merge "Add auto-scrolling in ListPopupWindow drag-to-open mode" into klp-dev
...
* commit '37eb3034a3a090587d6a0fba61c7ec703f901da5':
Add auto-scrolling in ListPopupWindow drag-to-open mode
2013-08-26 15:12:00 -07:00
Alan Viverette
06804da177
am 46502580: am 9212e350: Merge "Reconcile drag-to-open and touch event interception" into klp-dev
...
* commit '465025803983e1f8ff4d9468fcc86ee4467139c9':
Reconcile drag-to-open and touch event interception
2013-08-26 15:11:56 -07:00
Leon Scroggins III
c6ad1f4384
am 8f564fbe: am 3871fdb9: Merge "Fix unpremul setting in BitmapRegionDecoder." into klp-dev
...
* commit '8f564fbef3f8d1916662ededb33cb541802953d0':
Fix unpremul setting in BitmapRegionDecoder.
2013-08-26 15:11:53 -07:00
Edward Jee
dc92854513
am 0b3adcdf: am b2cc1d54: Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-dev
...
* commit '0b3adcdfd30cd3b0eb25a3d7929ae0cecd608d74':
Enables AT+ANDROID command in Bluetooth HFP.
2013-08-26 15:11:49 -07:00
Igor Murashkin
3b954819ca
am 395375e1: am 9e680685: Merge "camera2: CameraDevice#configureOutputs now deletes unused streams" into klp-dev
...
* commit '395375e1b0b2ae2250cbd850bda0cbfe94fe8073':
camera2: CameraDevice#configureOutputs now deletes unused streams
2013-08-26 15:11:46 -07:00
Scott Main
d7e478d14b
am f369afe6: am 0ef8a431: am 032c5630: am bb6b1ff0: am d608d5e3: add jb mr2 uses-feature items to reference page and fix a couple doc bugs
...
* commit 'f369afe690743f4e08c0443b65edef8080d46525':
add jb mr2 uses-feature items to reference page and fix a couple doc bugs
2013-08-26 15:11:43 -07:00
John Spurlock
db3bb617b1
am 7be199d7: am f8388885: Merge "Add new logging for system bar window state." into klp-dev
...
* commit '7be199d7ce6ea49489618a2ac6c4e7e1df45000b':
Add new logging for system bar window state.
2013-08-26 15:11:41 -07:00
Ying Wang
6af62e1165
am 62f16fe9: am d3373c29: Merge "Better aidl generated dependency" into klp-dev
...
* commit '62f16fe93deaa451d2bfc2d3409cf6e655513ca3':
Better aidl generated dependency
2013-08-26 15:11:38 -07:00
Wink Saville
3514fb8f15
am 2f963e79: (-s ours) am 3084eb99: am 59adfca6: (-s ours) am 33283a97: am dce52cdb: DO NOT MERGE: MDST is not ready until connected to DcTracker.
...
* commit '2f963e79e965a8761f25d681c3e261010e9b0a1a':
DO NOT MERGE: MDST is not ready until connected to DcTracker.
2013-08-26 15:11:35 -07:00
Wink Saville
2663ec405d
am 185601d4: am 3a9a4c2a: am 4e6e1749: am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported.
...
* commit '185601d43146765852de71ce9310b00ce88025bf':
In isMobileOk don't execute finally if mobile data is not supported.
2013-08-26 15:11:32 -07:00
Jeff Tinker
d1c0eff569
am ded3c260: am 91b87de7: Merge "Enhancement for OnInfo callback on DRM Framework" into klp-dev
...
* commit 'ded3c260a4fef10cb85b27c9c172717dd770d6e0':
Enhancement for OnInfo callback on DRM Framework
2013-08-26 15:11:30 -07:00
Daniel Sandler
6561841e7d
am e820825c: am fead1290: Make xxhdpi adb icon consistent with other densities.
...
* commit 'e820825c8129344b14d3db04f7bed5274028ca1a':
Make xxhdpi adb icon consistent with other densities.
2013-08-26 15:11:27 -07:00
Ying Wang
f3f80e34cb
am b44e5561: am 94366313: Fix docs build.
...
* commit 'b44e5561def5845e0b18e7b2e178dc12a415b9af':
Fix docs build.
2013-08-26 15:11:24 -07:00
Jim Miller
b155194775
am 517c8cf3: am 14cabdab: Merge "Add setting to disable keyguard widgets" into klp-dev
...
* commit '517c8cf31833cc8fde0e6546c41af7d39e5e5429':
Add setting to disable keyguard widgets
2013-08-26 15:11:20 -07:00
Jeff Brown
18643b58ee
am 2517d08b: am 61d806c7: Merge "Docs changes pursuant to API review feedback." into klp-dev
...
* commit '2517d08b9a09d123729b01d34840e96f099ea704':
Docs changes pursuant to API review feedback.
2013-08-26 15:11:17 -07:00
destradaa
4548c19704
am 8ea7b216: am 9e73cce6: Merge "Fix leaks of JNI objects in the local reference table" into klp-dev
...
* commit '8ea7b216703aa902012f8f1143ba38dc67f7e4f3':
Fix leaks of JNI objects in the local reference table
2013-08-26 15:11:14 -07:00
Tim Murray
61cc40bedc
am 493a4c85: am c264e044: Merge "Add garbage collection hooks" into klp-dev
...
* commit '493a4c85cd6476a9b932a3146421eab0f662113a':
Add garbage collection hooks
2013-08-26 15:11:11 -07:00
Chong Zhang
2e0ee66389
am 9c70038c: am 5de1faca: Merge "wifi-display: add certification options" into klp-dev
...
* commit '9c70038cba0e265b553aa8cda9b133fd8866b692':
wifi-display: add certification options
2013-08-26 15:11:07 -07:00
Jeff Sharkey
943bc8b389
am 308aacb9: am 365768fd: Merge "Return EXIF thumbnails when available." into klp-dev
...
* commit '308aacb924898b95d6114edfff3a985c897f2c6f':
Return EXIF thumbnails when available.
2013-08-26 15:11:04 -07:00
Vinit Deshapnde
d0fec8c885
Increase sampling data size limits
...
Integer doesn't seem to like number > 2 Gig; so converting all bits of
samples to long; and handling exceptions that may crash the service
Bug: 10459447
Change-Id: I1291e97ba6d0ab7304dc6a6e8ef819d17491e017
2013-08-26 15:11:01 -07:00
Jeff Sharkey
98e154c039
am d0fcacd9: am 98d62123: Merge "Add CancellationSignal support to file operations." into klp-dev
...
* commit 'd0fcacd949cd8b42b37d238a4ba74e3c29325277':
Add CancellationSignal support to file operations.
2013-08-26 15:11:01 -07:00
Dirk Dougherty
ec71e32a80
am 43bc44f5: am 570cd0f4: am f1fea527: am be2f72a1: am 2c30fe8a: Doc change: fix typo in policy docs.
...
* commit '43bc44f51250bf2568c2f64c106eb4a59b703bb2':
Doc change: fix typo in policy docs.
2013-08-26 15:10:59 -07:00
Baligh Uddin
dd896009ab
am 056c7d48: (-s ours) am 4f5e0804: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '056c7d48765f10ffac4117145757e804f5e709be':
Import translations. DO NOT MERGE
2013-08-26 15:10:56 -07:00
Baligh Uddin
7f39cac6b2
am dc010ce5: (-s ours) am 881de10c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'dc010ce544662cc82a0ccd28a6619ec0485f3b76':
Import translations. DO NOT MERGE
2013-08-26 15:10:52 -07:00
Svetoslav Ganov
f026518672
am e0612ffe: am 826debf5: Merge "Print UI bug fixing and printer discovery refactoring." into klp-dev
...
* commit 'e0612ffe5495602134d60422f63bfc05387512e1':
Print UI bug fixing and printer discovery refactoring.
2013-08-26 15:10:49 -07:00
John Huang
8317c1d6a8
am 0d3313ec: am 83bc5a8a: Merge "Additional logging to debug lost Wifi APs" into klp-dev
...
* commit '0d3313ecb6ec5aefb79d545a0853ddd1ec6b87ee':
Additional logging to debug lost Wifi APs
2013-08-26 15:10:46 -07:00
Baligh Uddin
82d02fc4bc
am 33c9f69b: (-s ours) am 8a2df167: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '33c9f69bb12908a9bb48594624529e97f5ee4828':
Import translations. DO NOT MERGE
2013-08-26 15:10:43 -07:00
Baligh Uddin
4934753d5c
am 54239215: (-s ours) am e1f9e2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '54239215ae7bb68b310d0ab0b50c139927666f00':
Import translations. DO NOT MERGE
2013-08-26 15:10:41 -07:00
Zhijun He
17e5e089a2
am 1278507a: am 4cabe3ea: Merge "ImageReader: Fix API doc table misalignment issue" into klp-dev
...
* commit '1278507a83c47c1510e7f8d6a8898ea2ae9e727e':
ImageReader: Fix API doc table misalignment issue
2013-08-26 15:10:38 -07:00
Jason Monk
96eee102b0
am 4163241f: am 4359d564: Merge "System binds PAC Local Proxy instead of self start" into klp-dev
...
* commit '4163241f146bffeda889bd8a04455945fc9f4922':
System binds PAC Local Proxy instead of self start
2013-08-26 15:10:35 -07:00
Vinit Deshapnde
1b3984af8e
am 402334a0: Merge "Fix an exception caused by incorrect data handling" into klp-dev
...
* commit '402334a09b367551f788d3fc397a3d26269ae756':
Fix an exception caused by incorrect data handling
2013-08-26 15:05:44 -07:00
Adam Powell
ef53553bf8
am 962a7093: Fix padding for simple_list_item_2
...
* commit '962a7093be28f7a6c9d1823bbfb02c7ef7059c3a':
Fix padding for simple_list_item_2
2013-08-26 15:05:32 -07:00
Chris Craik
7ff37ada13
am ff2c22e2: Merge "Move functor GL setup to just before functor" into klp-dev
...
* commit 'ff2c22e2a85eab426c0542947b6cb7dce5f4fb56':
Move functor GL setup to just before functor
2013-08-26 15:05:27 -07:00
Alan Viverette
b19863545d
am aad44178: Merge "Use transient state to preserve accessibility focus in ListView" into klp-dev
...
* commit 'aad44178685c1e31a8fa1519edd561b043b7c886':
Use transient state to preserve accessibility focus in ListView
2013-08-26 15:05:24 -07:00
Alan Viverette
37eb3034a3
am faf7a208: Merge "Add auto-scrolling in ListPopupWindow drag-to-open mode" into klp-dev
...
* commit 'faf7a2087e1228599c7b08a679a764d2abb0e9ed':
Add auto-scrolling in ListPopupWindow drag-to-open mode
2013-08-26 15:05:20 -07:00
Alan Viverette
4650258039
am 9212e350: Merge "Reconcile drag-to-open and touch event interception" into klp-dev
...
* commit '9212e350d52ea98cb673280870c54319b03ccad3':
Reconcile drag-to-open and touch event interception
2013-08-26 15:05:18 -07:00
Leon Scroggins III
8f564fbef3
am 3871fdb9: Merge "Fix unpremul setting in BitmapRegionDecoder." into klp-dev
...
* commit '3871fdb966846d9026500696e48ccc64349eedb4':
Fix unpremul setting in BitmapRegionDecoder.
2013-08-26 15:05:15 -07:00
Edward Jee
0b3adcdfd3
am b2cc1d54: Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-dev
...
* commit 'b2cc1d54aad84293c32c9c1e8727895d160898f9':
Enables AT+ANDROID command in Bluetooth HFP.
2013-08-26 15:05:10 -07:00
Igor Murashkin
395375e1b0
am 9e680685: Merge "camera2: CameraDevice#configureOutputs now deletes unused streams" into klp-dev
...
* commit '9e680685f92752c5c75a2f4929e017aec902aef6':
camera2: CameraDevice#configureOutputs now deletes unused streams
2013-08-26 15:05:07 -07:00
Scott Main
f369afe690
am 0ef8a431: am 032c5630: am bb6b1ff0: am d608d5e3: add jb mr2 uses-feature items to reference page and fix a couple doc bugs
...
* commit '0ef8a431a5090549dbc031bad36cb1e2a54ea839':
add jb mr2 uses-feature items to reference page and fix a couple doc bugs
2013-08-26 15:04:58 -07:00
John Spurlock
7be199d7ce
am f8388885: Merge "Add new logging for system bar window state." into klp-dev
...
* commit 'f8388885e49a0a0fa71f9a90301bd90a349cb1dd':
Add new logging for system bar window state.
2013-08-26 15:04:44 -07:00
Ying Wang
62f16fe93d
am d3373c29: Merge "Better aidl generated dependency" into klp-dev
...
* commit 'd3373c292a9fd0ae9c6bafb594ed7132304c6516':
Better aidl generated dependency
2013-08-26 15:04:34 -07:00
Wink Saville
2f963e79e9
am 3084eb99: am 59adfca6: (-s ours) am 33283a97: am dce52cdb: DO NOT MERGE: MDST is not ready until connected to DcTracker.
...
* commit '3084eb999ab81cb27be484802e2a71b57905b889':
DO NOT MERGE: MDST is not ready until connected to DcTracker.
2013-08-26 15:04:28 -07:00
Wink Saville
185601d431
am 3a9a4c2a: am 4e6e1749: am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported.
...
* commit '3a9a4c2a1005cabffec74369f39201c827a87936':
In isMobileOk don't execute finally if mobile data is not supported.
2013-08-26 15:04:25 -07:00
Jeff Tinker
ded3c260a4
am 91b87de7: Merge "Enhancement for OnInfo callback on DRM Framework" into klp-dev
...
* commit '91b87de7e1d9ddcef2dd1da0c7ad85a04ab2fe6f':
Enhancement for OnInfo callback on DRM Framework
2013-08-26 15:04:03 -07:00
Daniel Sandler
e820825c81
am fead1290: Make xxhdpi adb icon consistent with other densities.
...
* commit 'fead1290d74492af5fdf3dcb6739fbd1898dc239':
Make xxhdpi adb icon consistent with other densities.
2013-08-26 15:04:00 -07:00
Ying Wang
b44e5561de
am 94366313: Fix docs build.
...
* commit '94366313331a789440a3c077173aafcb85cabe78':
Fix docs build.
2013-08-26 15:03:43 -07:00
Jim Miller
517c8cf318
am 14cabdab: Merge "Add setting to disable keyguard widgets" into klp-dev
...
* commit '14cabdabac1eb87026e4bbd71a18530031b1dd34':
Add setting to disable keyguard widgets
2013-08-26 15:03:33 -07:00