122701 Commits

Author SHA1 Message Date
David Friedman
3207948444 am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
* commit '4186379a2a37123d31ce5d1aff1facc8e7dfbfd3':
  Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
2014-09-08 22:13:09 +00:00
David Friedman
7e8786d975 am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
* commit 'c6142d97d79bc6a5ce2bb77fce9ae5d988f49542':
  NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
2014-09-08 22:13:05 +00:00
David Friedman
4186379a2a Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
This reverts commit c6142d97d79bc6a5ce2bb77fce9ae5d988f49542.

Change-Id: Idc6fde822bf42300897d96fc934a94e6b9418d76
2014-09-08 21:58:22 +00:00
David Friedman
c6142d97d7 NDKr10b changes to be published to DAC NDK page.
Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

Change-Id: I559068eb1567bc03f69cadade5073f419635ad69
2014-09-08 11:45:27 -07:00
Wei Liu
636f3eac6d Add clear_top flag to settings action intent.
Bug: 17200185

Change-Id: I156a8726055452b56d8ccd52010cdea8baaa79c3
2014-09-04 21:33:20 +00:00
Deepanshu Gupta
9bfa073662 am 7119fbb6: am 4df075bc: am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '7119fbb63a32f4f51bf07293c0a7f5a3a32abba0':
  Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 18:10:53 +00:00
Deepanshu Gupta
8929642ca7 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]
2014-09-04 18:10:50 +00:00
Deepanshu Gupta
889ec19249 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]
2014-09-04 18:10:39 +00:00
Deepanshu Gupta
9f7c594a05 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]
2014-09-04 18:10:35 +00:00
Jean-Michel Trivi
525e552eef 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
2014-09-04 18:10:31 +00:00
Deepanshu Gupta
7119fbb63a am 4df075bc: am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '4df075bcb5770ba411b6a32c9daeac24da0597e2':
  Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 17:59:47 +00:00
Deepanshu Gupta
0ff5117fb3 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]
2014-09-04 17:59:44 +00:00
Deepanshu Gupta
a7ce11070a 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]
2014-09-04 17:59:41 +00:00
Deepanshu Gupta
ae6f259520 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]
2014-09-04 17:59:38 +00:00
Jean-Michel Trivi
800f3ca4dd 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
2014-09-04 17:59:35 +00:00
Deepanshu Gupta
4df075bcb5 am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '057eb404363184b75ab0e5d3768a22126703f750':
  Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 17:46:19 +00:00
Deepanshu Gupta
7055778ef5 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]
2014-09-04 17:46:15 +00:00
Deepanshu Gupta
19fa86cfd6 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]
2014-09-04 17:46:11 +00:00
Deepanshu Gupta
409e42a17e 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]
2014-09-04 17:46:08 +00:00
Jean-Michel Trivi
14c8acef21 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
2014-09-04 17:46:04 +00:00
Deepanshu Gupta
057eb40436 am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit 'a5176670c8ef21b42e0a2e7db07c968e3ceacb39':
  Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 17:33:28 +00:00
Deepanshu Gupta
a9f56d5a05 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]
2014-09-04 17:33:25 +00:00
Deepanshu Gupta
5384d40ed4 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]
2014-09-04 17:33:21 +00:00
Deepanshu Gupta
e19464aae4 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]
2014-09-04 17:33:13 +00:00
Jean-Michel Trivi
5fb35780a5 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
2014-09-04 17:33:09 +00:00
Deepanshu Gupta
a5176670c8 am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '033a54ec746bd8a4c5913f8290deb4a4ec653c50':
  Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 17:22:13 +00:00
Deepanshu Gupta
44db2b3ef6 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]
2014-09-04 17:22:10 +00:00
Deepanshu Gupta
b79bb54e92 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]
2014-09-04 17:22:07 +00:00
Deepanshu Gupta
9ee1556d60 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]
2014-09-04 17:22:04 +00:00
Jean-Michel Trivi
daf113b118 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
2014-09-04 17:22:01 +00:00
Deepanshu Gupta
033a54ec74 am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit 'c33fc8de1ddd2d27a499c146169b870513afca3b':
  Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 17:14:58 +00:00
Deepanshu Gupta
5d1755e9f5 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]
2014-09-04 17:14:53 +00:00
Deepanshu Gupta
f4ba873144 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]
2014-09-04 17:14:49 +00:00
Deepanshu Gupta
296b120c30 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]
2014-09-04 17:14:46 +00:00
Jean-Michel Trivi
5c6248c932 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
2014-09-04 17:14:42 +00:00
Ricardo Cervera
c5b5366f1b am ddfe9d11: docs: Added SONY logo (hi-res) for Wear site
* commit 'ddfe9d11fc11a0e4fafb71703a8212b7671cb354':
  docs: Added SONY logo (hi-res) for Wear site
2014-09-04 16:05:25 +00:00
Ricardo Cervera
ddfe9d11fc docs: Added SONY logo (hi-res) for Wear site
Change-Id: I64441072a9f6dbf6eb209c954a43056c19f29551
2014-09-04 08:52:39 -07:00
Deepanshu Gupta
a4d9786682 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]
2014-09-04 06:16:36 +00:00
Deepanshu Gupta
ccd53eecb9 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]
2014-09-04 06:16:32 +00:00
Deepanshu Gupta
2d70a5a9d1 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]
2014-09-04 06:07:21 +00:00
Deepanshu Gupta
6a6e63a0ef 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]
2014-09-04 06:07:18 +00:00
Deepanshu Gupta
06a3125513 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]
2014-09-04 05:56:35 +00:00
Deepanshu Gupta
80b9016110 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]
2014-09-04 05:56:32 +00:00
Deepanshu Gupta
3f1cc48ad1 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]
2014-09-04 05:48:37 +00:00
Deepanshu Gupta
b14ab8d402 am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit 'e9ea028b74950722163560d5dfb97b4403111cc4':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 05:48:33 +00:00
Deepanshu Gupta
c33fc8de1d am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '48349ea91823112e3fd2d431116027aed743b1a4':
  Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 05:33:14 +00:00
Deepanshu Gupta
c634383ac4 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]
2014-09-04 05:33:10 +00:00
Deepanshu Gupta
ae6a52eb0b 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]
2014-09-04 05:32:41 +00:00
Deepanshu Gupta
e9ea028b74 am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '6a9c6c6baedb994a619573388056c95475f84abf':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 05:32:32 +00:00
Deepanshu Gupta
48349ea918 am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '66224e2524e9b6723c783f14598c2e02118ea7f5':
  Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 05:22:43 +00:00