android_frameworks_support, branch cm-12.1 Unnamed repository; edit this file 'description' to name the repository. Merge tag 'android-5.1.1_r5' into cm-12.1 2015-07-04T14:51:02+00:00 Ricardo Cerqueira ricardo@cyngn.com 2015-07-04T14:51:02+00:00 fc5b106afac10fff3e151abbd2aed1d9ac6f236c Android 5.1.1 release 5 
Android 5.1.1 release 5
Merge "resolved conflicts for merge of 11b83982 to lmp-mr1-wfc-dev" into lmp-mr1-wfc-dev 2015-04-23T17:57:18+00:00 Xavier Ducrohet xav@google.com 2015-04-23T17:57:18+00:00 1e82b6f77a414b14597a10399dc4d9f5bec7286f 






resolved conflicts for merge of 11b83982 to lmp-mr1-wfc-dev
2015-04-23T17:56:44+00:00

Xavier Ducrohet
xav@google.com

2015-04-23T17:56:44+00:00

be3bde3e9b44d43aa2508c8824e09319b3f9b805

Change-Id: Ie67cd082c41472b9fbbc0323075a38fff9c5c679





Change-Id: Ie67cd082c41472b9fbbc0323075a38fff9c5c679







Merge commit '11b83982' into lmp-mr1-wfc-dev
2015-04-23T17:36:22+00:00

Qiwen Zhao
zhao@google.com

2015-04-23T17:36:22+00:00

66b7fc3124aee375f1916bad8a709ac5afd3801d

Change-Id: I4d430a54c4226541ebec4bf52cae31b75cde1e8d





Change-Id: I4d430a54c4226541ebec4bf52cae31b75cde1e8d







CMSupport: Sync MAX_ITEMS constant
2015-04-14T19:59:18+00:00

Jorge Ruesga
jorge@ruesga.com

2013-08-31T09:18:33+00:00

f3fe6a185c62d11cc99b1e295d113d435de7f971

Change-Id: I9f39aeec0ab4461a91fc9543493ce9ccffe18cf6
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>





Change-Id: I9f39aeec0ab4461a91fc9543493ce9ccffe18cf6
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>







CmSupport : Live folder empty content
2015-04-14T19:59:02+00:00

Danesh M
daneshm90@gmail.com

2013-08-31T00:19:40+00:00

949a989ff863d26f0b29dfd36fa6fe31311b2a50

Allow apps to specify empty layouts for folders.

Change-Id: I8d0fc88c6db4202f00e65f3a94368c8a00442c8b





Allow apps to specify empty layouts for folders.

Change-Id: I8d0fc88c6db4202f00e65f3a94368c8a00442c8b







CmSupport : LiveFolder
2015-04-14T19:58:51+00:00

Danesh Mondegarian
daneshm90@gmail.com

2013-08-16T08:49:23+00:00

f54dfdd0fc16e4916e46da931f0dec6ec812b8a6

Switch to plain log errors rather than exceptions.
Add api extra for existing folder ids, which is sent when
folders are binded.

Change-Id: I70dd8d24e9f4de3fd9479effeab75e1b821410e3





Switch to plain log errors rather than exceptions.
Add api extra for existing folder ids, which is sent when
folders are binded.

Change-Id: I70dd8d24e9f4de3fd9479effeab75e1b821410e3







Support : Add cm support library
2015-04-14T19:56:43+00:00

Danesh M
daneshm90@gmail.com

2013-08-06T19:32:51+00:00

7af46d66b7d28b9abdb4ec05c68335ad8c4af161

Cm specific public facing api's should be placed here
and not pollute the framework

Change-Id: I1491683a7a0420e290e0fd29c4b3fd17ee59b4a0





Cm specific public facing api's should be placed here
and not pollute the framework

Change-Id: I1491683a7a0420e290e0fd29c4b3fd17ee59b4a0







Update support repo version (22.0.1/13) and add javadoc
2015-03-31T22:12:42+00:00

Xavier Ducrohet
xav@google.com

2015-03-31T22:12:42+00:00

11b839821796e93cffd6712d2c721732d7ff0108

Some projects (appcompat, gridlayout, mediarouter) didn't
publish a sourcejar artifact.

Change-Id: I6fd19552148051ee87b7dcc24f6272548a663b50





Some projects (appcompat, gridlayout, mediarouter) didn't
publish a sourcejar artifact.

Change-Id: I6fd19552148051ee87b7dcc24f6272548a663b50







am 2fa17026: Fix android-support-v17-leanback-docs build.
2015-03-20T00:41:25+00:00

Ying Wang
wangying@google.com

2015-03-20T00:41:25+00:00

bb83628555debe5d3e1b31ef47d9570a3359971f

* commit '2fa1702616d42631a6ff5defece8c4d3e709fca4':
  Fix android-support-v17-leanback-docs build.





* commit '2fa1702616d42631a6ff5defece8c4d3e709fca4':
  Fix android-support-v17-leanback-docs build.