Dirk Dougherty
|
66f1c66980
|
am e84aa5fd: am 125e1d52: am d2161615: am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs
* commit 'e84aa5fdcfa4b96807a5d223feef3319b00f150d':
Doc change: move ndk docs jd into main docs tree.
|
2015-06-15 16:20:01 +00:00 |
|
Andrew Solovay
|
e9e22cf14b
|
am 5eca7828: am ccb50a7c: am dba3544f: am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs
* commit '5eca78285b7fc415fd0d34d23a13a3f0d9433793':
docs: Added AfW videos to "Android for Work" landing page
|
2015-06-15 16:19:54 +00:00 |
|
Rich Slogar
|
a31dc07a25
|
am 476b6088: am 2d275916: am 974f0d82: am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs
* commit '476b6088fe76089fe59c5b5f0e0918b58ba91931':
docs: sdk tools 24.3.2 download updates
|
2015-06-15 16:19:49 +00:00 |
|
Diego Perez
|
0682e68ac4
|
am 7974c975: am 0e3fb38e: am b39e85af: am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit '7974c9752b31b7bc701bf5e6605610004ee37d83':
New custom widgets library
|
2015-06-15 16:19:43 +00:00 |
|
Chet Haase
|
a08c103ea6
|
am 81b0c773: am 1f81e0bf: am c03fa1ee: Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
* commit '81b0c773201066fd01426804c99efb394784e191':
Add isFilterBitmap() overrides where appropriate
|
2015-06-15 16:19:37 +00:00 |
|
Diego Perez
|
014483dd3a
|
am dc73fc6d: am e5d3170d: am 0524e97a: Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev
* commit 'dc73fc6d4723d428667eb1e83b74912d1010f8ee':
Fix crash when shadowSize is 0
|
2015-06-15 16:19:30 +00:00 |
|
Jason Monk
|
bf077d36a3
|
am 9d78fc8d: am 0c8fd1a1: am 4b8704c9: Merge "Don\'t try to get entries for uninstalled apps." into mnc-dev
* commit '9d78fc8d29dde710fd91d4803a780d619969ff78':
Don't try to get entries for uninstalled apps.
|
2015-06-15 16:19:25 +00:00 |
|
Geoff Mendal
|
ddfc664147
|
Merge "Import translations. DO NOT MERGE"
|
2015-06-15 16:15:26 +00:00 |
|
Dirk Dougherty
|
e84aa5fdcf
|
am 125e1d52: am d2161615: am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs
* commit '125e1d52d48650809ac7e8a0b5e36170f56006e7':
Doc change: move ndk docs jd into main docs tree.
|
2015-06-15 16:08:27 +00:00 |
|
Andrew Solovay
|
5eca78285b
|
am ccb50a7c: am dba3544f: am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs
* commit 'ccb50a7c91c4e4f06e31cf0125c2d7f8ecb477c1':
docs: Added AfW videos to "Android for Work" landing page
|
2015-06-15 16:08:22 +00:00 |
|
Rich Slogar
|
476b6088fe
|
am 2d275916: am 974f0d82: am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs
* commit '2d2759164c56735d76eb4a58793e49a2855b844b':
docs: sdk tools 24.3.2 download updates
|
2015-06-15 16:08:17 +00:00 |
|
Diego Perez
|
7974c9752b
|
am 0e3fb38e: am b39e85af: am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit '0e3fb38eabc7012ec720ddfc97978a4d765e154d':
New custom widgets library
|
2015-06-15 16:08:12 +00:00 |
|
Chet Haase
|
81b0c77320
|
am 1f81e0bf: am c03fa1ee: Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
* commit '1f81e0bfd4a6be5098054313e91b96cbb7c1d849':
Add isFilterBitmap() overrides where appropriate
|
2015-06-15 16:08:07 +00:00 |
|
Geoff Mendal
|
4faf61dbbe
|
Import translations. DO NOT MERGE
Change-Id: I740e7755470c466a703ae90265362ad3f49e9aba
Auto-generated-cl: translation import
|
2015-06-15 09:08:02 -07:00 |
|
Diego Perez
|
dc73fc6d47
|
am e5d3170d: am 0524e97a: Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev
* commit 'e5d3170d92add758ceac2167ba0feb81847bc5f3':
Fix crash when shadowSize is 0
|
2015-06-15 16:08:01 +00:00 |
|
Jason Monk
|
9d78fc8d29
|
am 0c8fd1a1: am 4b8704c9: Merge "Don\'t try to get entries for uninstalled apps." into mnc-dev
* commit '0c8fd1a154f356ce95b7d029bcaf051b8cee181c':
Don't try to get entries for uninstalled apps.
|
2015-06-15 16:07:56 +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 |
|
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
|
72ea672852
|
am 1e6c78e8: (-s ours) am 8fdeda3d: (-s ours) 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 '1e6c78e87203d73004be74c7a1e40e6b77c25dd6':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
|
2015-06-15 15:00:43 +00:00 |
|
Filip Gruszczynski
|
e3d8648ef0
|
am 677557a8: (-s ours) am fc41fe26: 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 '677557a88420313ded51f79fc0d1cc1a949162d1':
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
|
2015-06-15 15:00:38 +00:00 |
|
Leon Scroggins III
|
6488104647
|
am f95055b5: (-s ours) am fdf48a16: 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
* commit 'f95055b5acbc59625aeb096ce93780b53fce1a1a':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
|
2015-06-15 15:00:33 +00:00 |
|
Leon Scroggins III
|
2717f96a7b
|
am 16470b4b: am e7641e29: am c3809332: am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev
* commit '16470b4b407f3c522e61cf4bf7d580acc2f3a9ec':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
|
2015-06-15 15:00:27 +00:00 |
|
Jason Monk
|
61f3bb7ba1
|
am 794e06df: am a3de0d98: am 7d79bea4: Merge "Fix invisible rotation tile" into mnc-dev
* commit '794e06dfa9da7596b8f22a3c25b606fcdb1076f4':
Fix invisible rotation tile
|
2015-06-15 15:00:19 +00:00 |
|
Prashant Malani
|
1e6c78e872
|
am 8fdeda3d: (-s ours) 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 '8fdeda3d3af44a0fcaa472af171a1dc09d4e0529':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
|
2015-06-15 14:48:39 +00:00 |
|
Filip Gruszczynski
|
677557a884
|
am fc41fe26: 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 'fc41fe263995069eb80bf1dd797e34532ce2ff1b':
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
|
2015-06-15 14:48:30 +00:00 |
|
Leon Scroggins III
|
f95055b5ac
|
am fdf48a16: 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 'fdf48a16b6d0a942595266cf6cbd2429fcfe0fed':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
|
2015-06-15 14:48:26 +00:00 |
|
Leon Scroggins III
|
16470b4b40
|
am e7641e29: am c3809332: am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev
* commit 'e7641e295d3f366b5269cbeeb1ca97a4c99b3791':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
|
2015-06-15 14:48:20 +00:00 |
|
Jason Monk
|
794e06dfa9
|
am a3de0d98: am 7d79bea4: Merge "Fix invisible rotation tile" into mnc-dev
* commit 'a3de0d9877b9951d964232cd3232f441c1b00379':
Fix invisible rotation tile
|
2015-06-15 14:48:15 +00:00 |
|
Jason Monk
|
835b0048ef
|
am fa0302bf: am 9fed13f8: am 5d8c276b: Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev
* commit 'fa0302bf131aa9a254616a32d2a2d3e1a85a8dc2':
Make references to ssid use a verbatim TtsSpan
|
2015-06-15 14:48:06 +00:00 |
|
Jason Monk
|
fa0302bf13
|
am 9fed13f8: am 5d8c276b: Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev
* commit '9fed13f8c3be41d5039757fe44631b31780d89b6':
Make references to ssid use a verbatim TtsSpan
|
2015-06-15 14:39:07 +00: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 |
|