Diego Perez
|
878d05539f
|
am dc929e28: am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit 'dc929e28acd32f7adebdc0d5afd3dc7eaa1a09fe':
Fix GcSnapshot drawInLayer when clipping is used.
|
2015-06-15 15:55:01 +00:00 |
|
Dirk Dougherty
|
125e1d52d4
|
am d2161615: am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs
* commit 'd2161615988725fd49791d67a534bccdee3957cd':
Doc change: move ndk docs jd into main docs tree.
|
2015-06-15 15:54:54 +00:00 |
|
Andrew Solovay
|
ccb50a7c91
|
am dba3544f: am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs
* commit 'dba3544fe08e9590a5f73fdb3bc6b30de10525a8':
docs: Added AfW videos to "Android for Work" landing page
|
2015-06-15 15:54:47 +00:00 |
|
Rich Slogar
|
2d2759164c
|
am 974f0d82: am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs
* commit '974f0d82281f79ac4c163eebaf1a341cf6ebcda2':
docs: sdk tools 24.3.2 download updates
|
2015-06-15 15:54:43 +00:00 |
|
Diego Perez
|
0e3fb38eab
|
am b39e85af: am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit 'b39e85afb160997a51df1dff18e118266c692243':
New custom widgets library
|
2015-06-15 15:54:38 +00:00 |
|
Chet Haase
|
1f81e0bfd4
|
am c03fa1ee: Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
* commit 'c03fa1ee54424b0c8b9ecdc06004c9dbdf4925f2':
Add isFilterBitmap() overrides where appropriate
|
2015-06-15 15:54:33 +00:00 |
|
Diego Perez
|
e5d3170d92
|
am 0524e97a: Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev
* commit '0524e97ac333c685b43cd9dbe5a49b28371b8865':
Fix crash when shadowSize is 0
|
2015-06-15 15:54:29 +00:00 |
|
Jason Monk
|
0c8fd1a154
|
am 4b8704c9: Merge "Don\'t try to get entries for uninstalled apps." into mnc-dev
* commit '4b8704c9e1024fa7aba66cce03cde78c7e10ba64':
Don't try to get entries for uninstalled apps.
|
2015-06-15 15:54:25 +00:00 |
|
Diego Perez
|
dc929e28ac
|
am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit '40a216d95973bb897ee0d755ef260a616f176798':
Fix GcSnapshot drawInLayer when clipping is used.
|
2015-06-15 15:48:24 +00:00 |
|
Dirk Dougherty
|
d216161598
|
am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs
* commit 'c6d3342064db4982298d0ebe79c8b974c57b99a7':
Doc change: move ndk docs jd into main docs tree.
|
2015-06-15 15:48:14 +00:00 |
|
Andrew Solovay
|
dba3544fe0
|
am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs
* commit 'ecc50268d72f0084a96bf98494229a294be10458':
docs: Added AfW videos to "Android for Work" landing page
|
2015-06-15 15:48:05 +00:00 |
|
Rich Slogar
|
974f0d8228
|
am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs
* commit 'afb19e27ccc80415956c1b63ddb19e953a7c3f20':
docs: sdk tools 24.3.2 download updates
|
2015-06-15 15:47:49 +00:00 |
|
Diego Perez
|
b39e85afb1
|
am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit 'ce5a79dacfb152317429cb69c28fe8bb39c02f4c':
New custom widgets library
|
2015-06-15 15:47:44 +00:00 |
|
Chet Haase
|
c03fa1ee54
|
Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
|
2015-06-15 15:45:57 +00:00 |
|
Diego Perez
|
0524e97ac3
|
Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev
|
2015-06-15 15:44:14 +00:00 |
|
Chet Haase
|
ea1363910b
|
Add isFilterBitmap() overrides where appropriate
Issue #21825791 add isFilterBitmap() override to appropriate Drawable subclasses
Change-Id: I5cbd72c034be79b0aa53815c7a5a8ea499e6e02d
|
2015-06-15 08:43:27 -07:00 |
|
Jason Monk
|
4b8704c9e1
|
Merge "Don't try to get entries for uninstalled apps." into mnc-dev
|
2015-06-15 15:41:38 +00:00 |
|
Jason Monk
|
c1f24abd10
|
Don't try to get entries for uninstalled apps.
Bug: 21837824
Change-Id: I6f7bbc309e9edf1db12476f55ab8be424739fae0
|
2015-06-15 11:38:03 -04:00 |
|
Diego Perez
|
8df6d037be
|
resolved conflicts for merge of 5a53816b to mnc-dev
Change-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f
|
2015-06-15 16:17:08 +01:00 |
|
Prashant Malani
|
8fdeda3d3a
|
am 6a7fdbdd: (-s ours) am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '6a7fdbddf7f7cec3ce511994b05eaeb94d18da6a':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
|
2015-06-15 14:37:21 +00:00 |
|
Filip Gruszczynski
|
fc41fe2639
|
am 5b15bd7b: am 94476be6: (-s ours) am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev
* commit '5b15bd7b2d403cedf2c76729b3a38925f52be66b':
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
|
2015-06-15 14:37:17 +00:00 |
|
Leon Scroggins III
|
fdf48a16b6
|
am 0af86ee7: am d7959d30: (-s ours) am 265d053d: am 81babaa3: am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '0af86ee769845334d27aa969fce3feba3e255d34':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
|
2015-06-15 14:37:13 +00:00 |
|
Leon Scroggins III
|
e7641e295d
|
am c3809332: am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev
* commit 'c3809332fca20139543710abc78b185fb1abc9f2':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
|
2015-06-15 14:37:08 +00:00 |
|
Jason Monk
|
a3de0d9877
|
am 7d79bea4: Merge "Fix invisible rotation tile" into mnc-dev
* commit '7d79bea4a92760559f61cfbe412cd8470b84c9fc':
Fix invisible rotation tile
|
2015-06-15 14:37:04 +00:00 |
|
Prashant Malani
|
6a7fdbddf7
|
am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit 'a8cff2acb7cc18d1cf123f45eb4e47e1ab876a20':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
|
2015-06-15 14:30:35 +00:00 |
|
Filip Gruszczynski
|
5b15bd7b2d
|
am 94476be6: (-s ours) am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev
* commit '94476be6a4055d09413d51e489446bf220c440a6':
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
|
2015-06-15 14:30:30 +00:00 |
|
Leon Scroggins III
|
0af86ee769
|
am d7959d30: (-s ours) am 265d053d: am 81babaa3: am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit 'd7959d30b61962a905de6c5081dac6b2f7be65c1':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
|
2015-06-15 14:30:25 +00:00 |
|
Leon Scroggins III
|
c3809332fc
|
am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev
* commit '8c9ae41bc7188cfe929d0b4f31c18faf9f9a03f7':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
|
2015-06-15 14:30:20 +00:00 |
|
Jason Monk
|
7d79bea4a9
|
Merge "Fix invisible rotation tile" into mnc-dev
|
2015-06-15 14:26:38 +00:00 |
|
Jason Monk
|
9fed13f8c3
|
am 5d8c276b: Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev
* commit '5d8c276bb91788441ec9a98717017eb01f1b348f':
Make references to ssid use a verbatim TtsSpan
|
2015-06-15 14:23:58 +00:00 |
|
Jason Monk
|
1634d182e1
|
Fix invisible rotation tile
Make sure we set the state at least once.
Bug: 21837219
Change-Id: Iabd0524f0c09fd3f7b895007204ddf49af19ea98
|
2015-06-15 10:19:26 -04:00 |
|
Jason Monk
|
5d8c276bb9
|
Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev
|
2015-06-15 14:14:52 +00:00 |
|
Geoff Mendal
|
ea1807aa9d
|
am 991f0f65: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '991f0f6549fd25a658f2519b4ee2169c6c5195eb':
Import translations. DO NOT MERGE
|
2015-06-15 14:09:04 +00:00 |
|
Jason Monk
|
6980d12c58
|
Make references to ssid use a verbatim TtsSpan
Bug: 20059794
Change-Id: Id92ef11e78547e168f55515dea2fc28519871d6f
|
2015-06-15 10:07:55 -04:00 |
|
Geoff Mendal
|
f2cd168186
|
am 8cacde13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '8cacde138398bb63a131452fab84e3677b87adc3':
Import translations. DO NOT MERGE
|
2015-06-15 13:54:36 +00:00 |
|
Geoff Mendal
|
26df364618
|
am 1ed87e5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1ed87e5d30b5ccfd1d7448f22389143928b8c118':
Import translations. DO NOT MERGE
|
2015-06-15 13:54:32 +00:00 |
|
Geoff Mendal
|
991f0f6549
|
Merge "Import translations. DO NOT MERGE" into mnc-dev
|
2015-06-15 13:53:11 +00:00 |
|
Geoff Mendal
|
1649b7895b
|
Import translations. DO NOT MERGE
Change-Id: I2b7fd1100aca78ce28f084bcf94637ba1975b21e
Auto-generated-cl: translation import
|
2015-06-15 08:51:34 -05:00 |
|
Paul Jensen
|
49ab026a52
|
am 8a6025fd: Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev
* commit '8a6025fdaf84ed6a9dbf1b21f48a931c90d4036e':
Remove most sleep() calls from ConnectivityServiceTest
|
2015-06-15 13:49:38 +00:00 |
|
Geoff Mendal
|
8cacde1383
|
Merge "Import translations. DO NOT MERGE" into mnc-dev
|
2015-06-15 13:45:48 +00:00 |
|
Geoff Mendal
|
1ed87e5d30
|
Merge "Import translations. DO NOT MERGE" into mnc-dev
|
2015-06-15 13:44:46 +00:00 |
|
Geoff Mendal
|
007c215917
|
Import translations. DO NOT MERGE
Change-Id: Id021d13867abfcb10e4fb1a9754ae21052f66ffb
Auto-generated-cl: translation import
|
2015-06-15 08:43:30 -05:00 |
|
Geoff Mendal
|
ee4a297766
|
Import translations. DO NOT MERGE
Change-Id: I7bb1d35595971e4d2ff83ba40c01524ed243d26d
Auto-generated-cl: translation import
|
2015-06-15 08:39:05 -05:00 |
|
Paul Jensen
|
8a6025fdaf
|
Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev
|
2015-06-15 13:35:48 +00:00 |
|
Chris Wren
|
09cd21be45
|
am b3c85643: Merge "remove setLatestEventInfo from USB" into mnc-dev
* commit 'b3c8564314a4ce05b722e33409f2c15bcdac6666':
remove setLatestEventInfo from USB
|
2015-06-15 12:35:48 +00:00 |
|
Chris Wren
|
b3c8564314
|
Merge "remove setLatestEventInfo from USB" into mnc-dev
|
2015-06-15 12:23:26 +00:00 |
|
Diego Perez
|
40a216d959
|
am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit 'df6f63badfe2572284dad8e34f152fd1c24a873e':
Fix GcSnapshot drawInLayer when clipping is used.
|
2015-06-15 10:14:24 +00:00 |
|
Diego Perez
|
df6f63badf
|
am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit '2422011d867f4d4516605148641bbeb7d9c2501b':
Fix GcSnapshot drawInLayer when clipping is used.
|
2015-06-15 10:03:58 +00:00 |
|
Diego Perez
|
2422011d86
|
am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit 'b2411c622cf9124f6af5f70d416adb179f9c88bb':
Fix GcSnapshot drawInLayer when clipping is used.
|
2015-06-15 09:50:51 +00:00 |
|
Diego Perez
|
b2411c622c
|
am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit 'ead59b0d479c3a911be87261b523255e8e51f76a':
Fix GcSnapshot drawInLayer when clipping is used.
|
2015-06-15 09:36:34 +00:00 |
|