Svetoslav Ganov
b06accf34f
Merge "Generate PDF from Canvas."
2013-06-21 20:09:51 +00:00
Wink Saville
142a29f45f
am ef8267c6: am 7334d25e: am 34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
...
* commit 'ef8267c6ad54eb4c8c00d3d36333fb12dd519588':
Fix misspelling of getLteSignalStrenght.
2013-06-21 12:17:57 -07:00
Wink Saville
ef8267c6ad
am 7334d25e: am 34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
...
* commit '7334d25e79d733b419aacfd706aad762f823f2f9':
Fix misspelling of getLteSignalStrenght.
2013-06-21 12:15:54 -07:00
Wink Saville
7334d25e79
am 34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
...
* commit '34fb4eae36bc926886149718672809a1ad43be97':
Fix misspelling of getLteSignalStrenght.
2013-06-21 12:12:24 -07:00
Wink Saville
34fb4eae36
Merge "Fix misspelling of getLteSignalStrenght."
2013-06-21 19:06:54 +00:00
The Android Open Source Project
cdd398b03a
am f05e2d25: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit 'f05e2d25372a47f5ff3b2d0c122d5ca8c3786238':
2013-06-21 11:58:23 -07:00
The Android Open Source Project
f05e2d2537
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: Id59401f35b9a467ddcc56c2167d6c30bb6c3d3e9
2013-06-21 11:56:57 -07:00
Romain Guy
64d592129e
Merge "Refcount the paint used by Canvas.drawPatch()"
2013-06-21 18:37:56 +00:00
Romain Guy
16ea8d373b
Refcount the paint used by Canvas.drawPatch()
...
Prevents crashes :)
Change-Id: I62103ce97490613142321f080b82c2edaed67a95
2013-06-21 11:35:52 -07:00
The Android Automerger
2ced32fbd1
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-21 11:35:45 -07:00
kmccormick
b38d53dacb
am 77caa0d0: am 42449d48: am da4a3f32: am 107e4830: am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit '77caa0d0a7c0ca3e1729ee1d2ef597b60d73a1d9':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 11:27:02 -07:00
Dirk Dougherty
1a47dfb381
am 4366d982: am f542a8b2: am 0628e3fe: am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit '4366d982c203a91e0e52faa0a1f9c23f8c27e47b':
Doc change: add video for edu page.
2013-06-21 11:26:59 -07:00
kmccormick
77caa0d0a7
am 42449d48: am da4a3f32: am 107e4830: am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit '42449d4842af545e76591d5aee8ee715b0d1a485':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 11:24:00 -07:00
Dirk Dougherty
4366d982c2
am f542a8b2: am 0628e3fe: am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit 'f542a8b2fecf74c5ae9eb2be08bcac36405e084a':
Doc change: add video for edu page.
2013-06-21 11:23:57 -07:00
kmccormick
42449d4842
am da4a3f32: am 107e4830: am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit 'da4a3f324b2944e3f088b67981ef30447a6fdeed':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 11:18:47 -07:00
kmccormick
da4a3f324b
am 107e4830: am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit '107e48304516e810f0ecc20a540cce1bc25f252c':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 11:14:44 -07:00
Dirk Dougherty
f542a8b2fe
am 0628e3fe: am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit '0628e3fec9e75c960f8aed871afb26c021b1b2da':
Doc change: add video for edu page.
2013-06-21 11:11:11 -07:00
Dirk Dougherty
0628e3fec9
am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit 'c496c2a8889f1b676bb48c77c81bf8d3f39ed3a1':
Doc change: add video for edu page.
2013-06-21 11:07:44 -07:00
kmccormick
107e483045
am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit '3f4759a0268860511ff844c59968843e2985d3ef':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 11:05:26 -07:00
kmccormick
3f4759a026
am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit '947857c11b9c50d97b9952bbbc29149680e7d4a3':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 10:59:18 -07:00
kmccormick
947857c11b
am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit 'cce880028ee694e296d2585b8932868b14f71223':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 10:57:38 -07:00
kmccormick
cce880028e
am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit '9c309d3db95b1fc63925a18b81e6ceabcaa18407':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 10:56:13 -07:00
Scott Main
4643a42305
am 17c96b1b: am 3aeba489: am fbba76fe: am 20eac772: am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
...
* commit '17c96b1b144149e5b152ee2deb134a96c92cab6f':
add Arabic Google Play badges to generator bug: 7994508
2013-06-21 10:48:08 -07:00
Scott Main
17c96b1b14
am 3aeba489: am fbba76fe: am 20eac772: am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
...
* commit '3aeba489b4df2522375356daf5358bf6938c5a96':
add Arabic Google Play badges to generator bug: 7994508
2013-06-21 10:45:33 -07:00
Scott Main
3aeba489b4
am fbba76fe: am 20eac772: am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
...
* commit 'fbba76fe21f937e935dcaebd677b22479d2e32a2':
add Arabic Google Play badges to generator bug: 7994508
2013-06-21 10:43:34 -07:00
Romain Guy
2c290392c9
Merge "Batch 9-patches in a single mesh whenever possible"
2013-06-21 17:42:23 +00:00
Chris Craik
ede7eb7749
Merge "Make op outputting const, for more general logging"
2013-06-21 17:39:14 +00:00
Scott Main
fbba76fe21
am 20eac772: am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
...
* commit '20eac772f32e3b40959a8fb7c64565aad94b8054':
add Arabic Google Play badges to generator bug: 7994508
2013-06-21 10:38:37 -07:00
Georgi Nikolov
3b8b276644
Merge "Add javadoc comments explaining SYNC_EXTRAS that did not have documentation"
2013-06-21 17:27:12 +00:00
Romain Guy
03c00b5a13
Batch 9-patches in a single mesh whenever possible
...
This change also fixes the way batched bitmaps were handled
inside a layer. The layer is now correctly dirtied to minimize
the amount of pixels to blend.
Fix alpha, mode and opaque computations for DrawPatchOp.
Change-Id: I1b6cd581c0f0db66c1002bb4fb1a9811e55bfa78
2013-06-21 10:13:58 -07:00
Wink Saville
29c8b00f14
Fix misspelling of getLteSignalStrenght.
...
Change to getLteSignalStrength.
Change-Id: Ie2acec9e01af0e64a61902383f06729a7cee1975
2013-06-21 09:58:11 -07:00
Wink Saville
44bd61efbf
am f77a7877: am d446dd75: am 446792ba: Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
...
* commit 'f77a7877cd5e6850b52c2b9beae714b22352b4a0':
The config_show4GForLTe is dynamic use latest value.
2013-06-21 08:53:58 -07:00
Wink Saville
f77a7877cd
am d446dd75: am 446792ba: Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
...
* commit 'd446dd756081ec75693fc538e3460c9a2c758fe4':
The config_show4GForLTe is dynamic use latest value.
2013-06-21 08:52:07 -07:00
Wink Saville
d446dd7560
am 446792ba: Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
...
* commit '446792ba75459908d4f9ad322c08566a52e1f91e':
The config_show4GForLTe is dynamic use latest value.
2013-06-21 08:49:26 -07:00
Wink Saville
446792ba75
Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
2013-06-21 15:43:56 +00:00
Iliyan Malchev
e36b93575f
am 7bc28ed7: am e6345a19: am 9233fc00: Revert "Revert "wifi: Get full scan results""
...
* commit '7bc28ed76b9a6591bdda37b472c3f7dc1ffae987':
Revert "Revert "wifi: Get full scan results""
2013-06-20 20:16:51 -07:00
Iliyan Malchev
7bc28ed76b
am e6345a19: am 9233fc00: Revert "Revert "wifi: Get full scan results""
...
* commit 'e6345a19129484572d3200edfff7f002a4314d0b':
Revert "Revert "wifi: Get full scan results""
2013-06-20 20:15:09 -07:00
Iliyan Malchev
e6345a1912
am 9233fc00: Revert "Revert "wifi: Get full scan results""
...
* commit '9233fc0023755e190e7c28374c5c6fa6558dec70':
Revert "Revert "wifi: Get full scan results""
2013-06-20 20:13:04 -07:00
Iliyan Malchev
9233fc0023
Revert "Revert "wifi: Get full scan results""
...
This reverts commit c2cbd4c11bfb83344502bd80389538795bae03cb.
Change-Id: Ia1cbde588ae9706966d6340c702fcfe1a82cfa79
2013-06-21 03:10:20 +00:00
Romain Guy
d485ef27c7
Merge "An identity matrix should be considered a pure translate matrix"
2013-06-21 01:31:55 +00:00
Wink Saville
c06462c1ad
The config_show4GForLTe is dynamic use latest value.
...
Previously this was updated only at construction time,
but the value isn't even set at that time and can change
at anytime. So instead read the current value when needed.
Bug: 9513380
Change-Id: I50c676beadf5df8190897a9f6ab94c098e8d7e71
2013-06-20 18:15:20 -07:00
Romain Guy
f6bed4f12a
An identity matrix should be considered a pure translate matrix
...
Change-Id: I75e91797e8270f902f67bdd7bb526cccc23adc6b
2013-06-20 17:52:07 -07:00
The Android Open Source Project
fb5dbfea1a
am 86c41e8f: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '86c41e8f250899149c89693e1ad0f7dcf580bfd1':
TelephonyManager.listen can have notifyNow always true.
add ViewGroup's layoutMode attribute to public resources bug: 9359960
2013-06-20 17:34:09 -07:00
The Android Open Source Project
86c41e8f25
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I179642d15ce613dac101897cadf2c63ca60c5a11
2013-06-20 17:31:59 -07:00
kmccormick
9c309d3db9
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
Change-Id: I32fe3880852ed8bcbacec0bb5bf385b0022a791f
2013-06-20 17:16:47 -07:00
Brian Carlstrom
7d73e227fe
Merge "Remove libdvm dependency"
2013-06-20 23:54:18 +00:00
Brian Carlstrom
9f8203a159
Remove libdvm dependency
...
Change-Id: I7d37db4e72e9435ecd514340cf61a051dc272f04
2013-06-20 16:34:45 -07:00
Romain Guy
d4fed90d24
Merge "Add debugging logs for GPU pixel buffers"
2013-06-20 23:32:40 +00:00
Romain Guy
9e6f3ac109
Add debugging logs for GPU pixel buffers
...
Change-Id: I7edb04dd30ee6fd823099e72788169cc185e70f2
2013-06-20 16:31:35 -07:00
Dirk Dougherty
c496c2a888
am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit '68630bedefb36cb6789f573b065c13e441121611':
Doc change: add video for edu page.
2013-06-20 15:35:59 -07:00
