OSDN Git Service
Deepanshu Gupta [Thu, 4 Sep 2014 18:17:38 +0000 (18:17 +0000)]
am
8929642c: am
0ff5117f: am
7055778e: am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
8929642ca72981f3c5cd4e7d408d47c724d9127b':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:17:32 +0000 (18:17 +0000)]
am
889ec192: am
a7ce1107: am
19fa86cf: am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
889ec19249fecfa7121c77b4c2bb32a054311cb5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:17:28 +0000 (18:17 +0000)]
am
9f7c594a: am
ae6f2595: am
409e42a1: am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
9f7c594a05411191d83ccb21655fbd8d52f56189':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 18:17:24 +0000 (18:17 +0000)]
am
525e552e: am
800f3ca4: am
14c8acef: am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
525e552eef3e38f3ab1a61377ebe69af43e959d7':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 18:10:50 +0000 (18:10 +0000)]
am
0ff5117f: am
7055778e: am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
0ff5117fb3aebfd64ffe26ff68308632c7ceeb3d':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:10:39 +0000 (18:10 +0000)]
am
a7ce1107: am
19fa86cf: am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
a7ce11070a74f7a0447f0d40d51cb0d3f95999fd':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:10:35 +0000 (18:10 +0000)]
am
ae6f2595: am
409e42a1: am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
ae6f2595206d33f04c951c2f3dfff5ede100c942':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 18:10:31 +0000 (18:10 +0000)]
am
800f3ca4: am
14c8acef: am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
800f3ca4ddf52fe46d039505266c84b0ad0234b1':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 17:59:44 +0000 (17:59 +0000)]
am
7055778e: am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
7055778ef5e97f6f83181a44c9b3804632f6f64e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:59:41 +0000 (17:59 +0000)]
am
19fa86cf: am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
19fa86cfd6fddb63715b50a4e0bc881d2ea34133':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:59:38 +0000 (17:59 +0000)]
am
409e42a1: am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
409e42a17eeedf125d012ebc3f1d91fcf5812573':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:59:35 +0000 (17:59 +0000)]
am
14c8acef: am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
14c8acef21136a07e5e750b245874d779f410b53':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 17:46:15 +0000 (17:46 +0000)]
am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
a9f56d5a050845703bdcfff734d9d189bec2ddec':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:46:11 +0000 (17:46 +0000)]
am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
5384d40ed4ec8f3546be94e6cae7c0011ef235a5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:46:08 +0000 (17:46 +0000)]
am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
e19464aae4ba251c758f3b27601ef3470e0a8c2d':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:46:04 +0000 (17:46 +0000)]
am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
5fb35780a53c239e34aec8beccd328cad9145e3d':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 17:33:25 +0000 (17:33 +0000)]
am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
44db2b3ef65ff2b0aa340018a6db93cdd52caa60':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:33:21 +0000 (17:33 +0000)]
am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
b79bb54e92b03bc032a91084f8a5ab7246136d9f':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:33:13 +0000 (17:33 +0000)]
am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
9ee1556d601e1f1f60a01bb7137bad48a7923a3d':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:33:09 +0000 (17:33 +0000)]
am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
daf113b118c658a493bac194d3b5ba8ab91dbd62':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:10 +0000 (17:22 +0000)]
am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
5d1755e9f51f81d54a3566aa6304919fbf467091':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:07 +0000 (17:22 +0000)]
am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
f4ba8731441035d8f3bc4dc622e2eca6eeb47a3d':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:04 +0000 (17:22 +0000)]
am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
296b120c3053db8b92fb84cb7f433da7f4e99a25':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:22:01 +0000 (17:22 +0000)]
am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
5c6248c9321990f0fbe8ac7c061f0e61ba0725f1':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:53 +0000 (17:14 +0000)]
am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
c634383ac49b03cd8fd152b4278cad1b94b84bcf':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:49 +0000 (17:14 +0000)]
am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
338e32ba521df8cbd295e69d8f20626452baa4a5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:46 +0000 (17:14 +0000)]
am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
a82db08e1d5f2c7b1751a93bc10d0fc5d231f9e4':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:14:42 +0000 (17:14 +0000)]
am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
1310a1cdba8a0f5e1c8741a5fbcf81eb76c6c2b2':
Do not restore the media button event receiver
Ricardo Cervera [Thu, 4 Sep 2014 16:16:24 +0000 (16:16 +0000)]
am
c5b5366f: am
ddfe9d11: docs: Added SONY logo (hi-res) for Wear site
* commit '
c5b5366f1ba236a98cb5aa044b89c6302baf4540':
docs: Added SONY logo (hi-res) for Wear site
Ricardo Cervera [Thu, 4 Sep 2014 16:05:25 +0000 (16:05 +0000)]
am
ddfe9d11: docs: Added SONY logo (hi-res) for Wear site
* commit '
ddfe9d11fc11a0e4fafb71703a8212b7671cb354':
docs: Added SONY logo (hi-res) for Wear site
Ricardo Cervera [Thu, 4 Sep 2014 15:52:39 +0000 (08:52 -0700)]
docs: Added SONY logo (hi-res) for Wear site
Change-Id: I64441072a9f6dbf6eb209c954a43056c19f29551
Deepanshu Gupta [Thu, 4 Sep 2014 06:26:25 +0000 (06:26 +0000)]
am
a4d97866: am
2d70a5a9: am
06a31255: am
3f1cc48a: (-s ours) am
ae6a52eb: am
1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '
a4d978668219572b71538dc98dab461fe99dfcc3':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 06:26:21 +0000 (06:26 +0000)]
am
ccd53eec: am
6a6e63a0: am
80b90161: am
b14ab8d4: (-s ours) am
e9ea028b: am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
ccd53eecb946ad8d08fb332f0159db4816e62604':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 06:16:36 +0000 (06:16 +0000)]
am
2d70a5a9: am
06a31255: am
3f1cc48a: (-s ours) am
ae6a52eb: am
1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '
2d70a5a9d1556f269b8ed79b1f6a896ce8241b51':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 06:16:32 +0000 (06:16 +0000)]
am
6a6e63a0: am
80b90161: am
b14ab8d4: (-s ours) am
e9ea028b: am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
6a6e63a0efed47fea0b1f080a3092d7931941851':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 06:07:21 +0000 (06:07 +0000)]
am
06a31255: am
3f1cc48a: (-s ours) am
ae6a52eb: am
1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '
06a31255133bcc21ed2f1d821b5e120fefddc117':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 06:07:18 +0000 (06:07 +0000)]
am
80b90161: am
b14ab8d4: (-s ours) am
e9ea028b: am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
80b901611008824ff897f5434a840680b1ae40d5':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:56:35 +0000 (05:56 +0000)]
am
3f1cc48a: (-s ours) am
ae6a52eb: am
1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '
3f1cc48ad1f87e8ea35d2d706eafb707743cc662':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:56:32 +0000 (05:56 +0000)]
am
b14ab8d4: (-s ours) am
e9ea028b: am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
b14ab8d402ac3b001601492d9f989e54f761cc2e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:48:37 +0000 (05:48 +0000)]
am
ae6a52eb: am
1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '
ae6a52eb0b02eae92b8800b29dbaf34e647bc3ae':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:48:33 +0000 (05:48 +0000)]
am
e9ea028b: am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
e9ea028b74950722163560d5dfb97b4403111cc4':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:33:10 +0000 (05:33 +0000)]
am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
8bc68f964801f3dcb36a76628cd3d289f3f279ca':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:32:41 +0000 (05:32 +0000)]
am
1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '
1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:32:32 +0000 (05:32 +0000)]
am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
6a9c6c6baedb994a619573388056c95475f84abf':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:22:40 +0000 (05:22 +0000)]
am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
52ee9b99f55cd17c484fcaf2433c688967284468':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:12:28 +0000 (05:12 +0000)]
am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
ffd0e8bf9f803e4881736d1b2e8b54e31888e980':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:59:34 +0000 (04:59 +0000)]
am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
a6f32d7ff19319c5ed61d113672f112a6f54c938':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:46:28 +0000 (04:46 +0000)]
am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
64d4ef8cf2f9ec6b7af6795fa9feb18cc07ba3d9':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:36:02 +0000 (04:36 +0000)]
am
a92f199d: am
0ddd915f: am
509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
* commit '
a92f199dcce9708b5c2a814c110827216a176fd5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:35:58 +0000 (04:35 +0000)]
am
135b8207: am
1c3a8845: am
47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
* commit '
135b820789d393683df09f10631e7e9b16cfdb31':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:32:46 +0000 (04:32 +0000)]
am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
6c1bf6b161cf3c18b49831eba71811d3fa00d108':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:32:42 +0000 (04:32 +0000)]
am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
e73e14fd02f50e0e9b3fb3ca890de7cb96d8d48b':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:27:43 +0000 (04:27 +0000)]
am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
638894803cc8bb57d73ea6aaddd1accbeb52643e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:24:46 +0000 (04:24 +0000)]
am
0ddd915f: am
509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
* commit '
0ddd915fb1d0add3bcab269abc1f8f46e2135b7a':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:24:04 +0000 (04:24 +0000)]
am
1c3a8845: am
47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
* commit '
1c3a884519dc5937bf321519d6adafb41a333bc1':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:14:41 +0000 (04:14 +0000)]
am
509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
* commit '
509e5db14908f85c1ad4b93e8bbed5afd4c2c8fe':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:14:31 +0000 (04:14 +0000)]
am
47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
* commit '
47a400131f026fd4afdf09e77fe82e79201c1458':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 03:18:27 +0000 (03:18 +0000)]
am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
6530cca1edf79ddcd520e2e5bc2695adfb0d3680':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 02:22:53 +0000 (02:22 +0000)]
am
a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
* commit '
a780eee46244062d699f76875fd05775c2ee92de':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 02:22:43 +0000 (02:22 +0000)]
am
9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
9776312a80f0072bf1d1fe8183e168f7d5879c4c':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 02:15:06 +0000 (02:15 +0000)]
am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
2db4037c628c70f6206a05ade4e606e0b47e9f7c':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 02:15:02 +0000 (02:15 +0000)]
am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
8ed784e2893c79d943b6184d25167ecf72a9a9ed':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 02:02:20 +0000 (02:02 +0000)]
am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
4f53d92c2f10f774cfdcf17ded82551ea19924be':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 02:01:59 +0000 (02:01 +0000)]
am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
edc8b8579ba9f47bbca0ac0c2f0eb11d0eadab09':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:58 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:48 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:37 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:16 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:50:45 +0000 (01:50 +0000)]
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:50:27 +0000 (01:50 +0000)]
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:50:05 +0000 (01:50 +0000)]
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
Scott Rowe [Thu, 4 Sep 2014 00:13:02 +0000 (00:13 +0000)]
am
048d8baa: am
0ccf80c3: Merge "docs: b/
15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
* commit '
048d8baaffadc28ee8e7bab0ce61a868c09c311a':
docs: b/
15790433 updated for xxhdpi and xxxhdpi
Scott Rowe [Wed, 3 Sep 2014 23:58:25 +0000 (23:58 +0000)]
am
0ccf80c3: Merge "docs: b/
15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
* commit '
0ccf80c31dbf236ec8ffafc8c72f036c3137bc5a':
docs: b/
15790433 updated for xxhdpi and xxxhdpi
Scott Rowe [Wed, 3 Sep 2014 23:52:11 +0000 (23:52 +0000)]
Merge "docs: b/
15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
Ricardo Cervera [Wed, 3 Sep 2014 23:37:46 +0000 (23:37 +0000)]
am
15abafe2: am
c0393e7f: Merge "docs: Docs for Android project view. Bug:
17108468" into klp-modular-docs
* commit '
15abafe2c0bbe034a63162ff409922225f55aed9':
docs: Docs for Android project view. Bug:
17108468
Joe Fernandez [Wed, 3 Sep 2014 23:29:46 +0000 (23:29 +0000)]
am
9de22952: am
ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs
* commit '
9de229527e710a90b03a415a9b752cc6e2a11592':
docs: Fix bug with Accessibility Services dev guide
Ricardo Cervera [Wed, 3 Sep 2014 23:29:38 +0000 (23:29 +0000)]
am
c0393e7f: Merge "docs: Docs for Android project view. Bug:
17108468" into klp-modular-docs
* commit '
c0393e7fba742027e2cb4b72cb9e7d9e52887516':
docs: Docs for Android project view. Bug:
17108468
Ricardo Cervera [Wed, 3 Sep 2014 23:22:52 +0000 (23:22 +0000)]
Merge "docs: Docs for Android project view. Bug:
17108468" into klp-modular-docs
Joe Fernandez [Wed, 3 Sep 2014 23:18:16 +0000 (23:18 +0000)]
am
ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs
* commit '
ab833be68e3e51f6be032d552bc53802f3fc52f2':
docs: Fix bug with Accessibility Services dev guide
Joe Fernandez [Wed, 3 Sep 2014 23:12:19 +0000 (23:12 +0000)]
Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs
Ricardo Cervera [Wed, 3 Sep 2014 21:45:54 +0000 (21:45 +0000)]
am
a32f29e2: am
a4fe79a4: docs: Adding Sony logo to wear page
* commit '
a32f29e225e989fad682df91cb0a1cd36e7b7279':
docs: Adding Sony logo to wear page
Ricardo Cervera [Wed, 3 Sep 2014 21:45:49 +0000 (21:45 +0000)]
am
734ef513: am
2d80f931: docs: Adding Sony logo to Wear partners
* commit '
734ef51380a4f6fce0a633f56f9db5b6eef5be71':
docs: Adding Sony logo to Wear partners
Ricardo Cervera [Wed, 3 Sep 2014 21:34:17 +0000 (21:34 +0000)]
am
a4fe79a4: docs: Adding Sony logo to wear page
* commit '
a4fe79a4c4e36770c95f8450b664d7a1fa111004':
docs: Adding Sony logo to wear page
Ricardo Cervera [Wed, 3 Sep 2014 21:34:13 +0000 (21:34 +0000)]
am
2d80f931: docs: Adding Sony logo to Wear partners
* commit '
2d80f9317fe69b932d5d9aeb9fc14017fab1af9c':
docs: Adding Sony logo to Wear partners
Ricardo Cervera [Wed, 3 Sep 2014 21:26:59 +0000 (14:26 -0700)]
docs: Adding Sony logo to wear page
Change-Id: I5e56ca313364d832bb26f7b07891381a0c2b55df
Jean-Michel Trivi [Wed, 3 Sep 2014 21:23:49 +0000 (21:23 +0000)]
am
1c9d1485: am
6d4873f5: am
0511ba50: Do not persist and restore the media button event receiver
* commit '
1c9d1485f381d610152abd64bfaa6d5d963878d2':
Do not persist and restore the media button event receiver
Ricardo Cervera [Wed, 3 Sep 2014 21:17:06 +0000 (14:17 -0700)]
docs: Adding Sony logo to Wear partners
Change-Id: I3c4b52d647f0a942ef5d5daad6fb6d5197839f2d
Jean-Michel Trivi [Wed, 3 Sep 2014 21:11:13 +0000 (21:11 +0000)]
am
6d4873f5: am
0511ba50: Do not persist and restore the media button event receiver
* commit '
6d4873f577774e5e7427e2675e4c6ff8049646be':
Do not persist and restore the media button event receiver
Jean-Michel Trivi [Wed, 3 Sep 2014 20:59:53 +0000 (20:59 +0000)]
am
0511ba50: Do not persist and restore the media button event receiver
* commit '
0511ba506d30d0a517491a92eda8d001a441d557':
Do not persist and restore the media button event receiver
Michael Wright [Tue, 2 Sep 2014 22:02:23 +0000 (22:02 +0000)]
am
da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness curve
* commit '
da3b43633fe86d69aab5cab52826e76e01f18d63':
DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
Michael Wright [Fri, 29 Aug 2014 00:42:16 +0000 (17:42 -0700)]
DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
Some devices may contain things like transflective displays where
they actually want the backlight brightness to decrease in the face
of high ambient light scenarios. In the interest of time, just use a
linear interpolation based on the brightness control points for these
cases but in the future we should consider adding a non-monotonic
cubic spline.
Bug:
15611140
Change-Id: I308ad00943d916866ee8d2507a41b7032e6b524e
Joe Fernandez [Fri, 29 Aug 2014 23:24:15 +0000 (16:24 -0700)]
docs: Fix bug with Accessibility Services dev guide
b/
11448573
Change-Id: I778c26f86c4a2cb3ebef9f3e75b5d544269486dc
Scott Rowe [Fri, 29 Aug 2014 21:17:08 +0000 (21:17 +0000)]
am
6208e7b5: am
1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs
* commit '
6208e7b56080956ffc48ade8d0b0f038b901cb23':
docs: remove references to resource browser; point to SDK instead
Scott Rowe [Fri, 29 Aug 2014 21:04:16 +0000 (21:04 +0000)]
am
1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs
* commit '
1014b9aa491d4d7dd4d4fc2510e7b6e6b3b4654d':
docs: remove references to resource browser; point to SDK instead
Scott Rowe [Fri, 29 Aug 2014 20:52:52 +0000 (20:52 +0000)]
Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs
Jean-Michel Trivi [Fri, 29 Aug 2014 17:34:24 +0000 (17:34 +0000)]
am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
ec50dfc03ca90e4a8528da77297fe141cc62d3ff':
Do not restore the media button event receiver
Jean-Michel Trivi [Fri, 29 Aug 2014 17:21:43 +0000 (17:21 +0000)]
am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
20fc473c69ae9c564ceb7fd357acc09c6b9e1aaf':
Do not restore the media button event receiver
Jean-Michel Trivi [Fri, 29 Aug 2014 17:08:50 +0000 (17:08 +0000)]
am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
f0336eb87d32414eb14865044be41ea590e7a6ac':
Do not restore the media button event receiver
Jean-Michel Trivi [Fri, 29 Aug 2014 16:54:22 +0000 (16:54 +0000)]
am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
2cb287f9cc79b0cd9e8ea37adf4b3411253eb244':
Do not restore the media button event receiver
Jean-Michel Trivi [Fri, 29 Aug 2014 16:41:10 +0000 (16:41 +0000)]
am
9ea996a3: Do not restore the media button event receiver
* commit '
9ea996a330a21af89f308bdf52e02a470643013b':
Do not restore the media button event receiver
OSDN Git Service
