Commit Graph

16312 Commits

Author SHA1 Message Date
Xavier Ducrohet
2bc7c21179 am 03dfa603: am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.
* commit '03dfa603106b1c707e835628ce3ef98279998dd7':
  Update build tools to 22.0.1. DO NOT MERGE.
2015-03-17 19:57:33 +00:00
Xavier Ducrohet
03dfa60310 am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.
* commit 'cd572c00327136d55d168add78515c9a932ddad2':
  Update build tools to 22.0.1. DO NOT MERGE.
2015-03-16 22:36:58 +00:00
Xavier Ducrohet
cd572c0032 am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.
* commit '4ea9bca1234a5a122d4c8db39dc2b4dde5799928':
  Update build tools to 22.0.1. DO NOT MERGE.
2015-03-16 22:28:04 +00:00
Xavier Ducrohet
4ea9bca123 Update build tools to 22.0.1. DO NOT MERGE.
Bug: 19085051
Change-Id: Ia62982e7bee589c37f8a755d7e6bb51264556412
2015-03-16 15:21:39 -07:00
Dan Albert
73b3f5cde4 am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too."
* commit '80dd2ac93d4e89c419eb9c57ddf3178212180564':
  Fix SDK library paths for Windows and Darwin too.
2015-03-14 03:12:43 +00:00
Dan Albert
80dd2ac93d Merge "Fix SDK library paths for Windows and Darwin too." 2015-03-14 03:03:18 +00:00
Dan Albert
d4a1f0619b Fix SDK library paths for Windows and Darwin too.
Change-Id: Ibaae6fd4089c804f50f8065e614c5de1b71c242b
2015-03-14 02:34:38 +00:00
Dan Albert
e0f3196e3a am 170b153b: Merge "Fix library paths for SDK tools."
* commit '170b153b3e3b087f77d806323a685ca0b4597561':
  Fix library paths for SDK tools.
2015-03-14 00:13:10 +00:00
Dan Albert
170b153b3e Merge "Fix library paths for SDK tools." 2015-03-14 00:02:38 +00:00
Dan Albert
b7125622c8 Fix library paths for SDK tools.
The rpath for the binaries is ../lib but the libraries were being
installed to the same directory as the executables.

Bug: 19617220
Change-Id: I5c4158698b6703843b67543d4396e2bffc5fb313
2015-03-13 16:30:21 -07:00
Deepanshu Gupta
62fdf40a51 am 7e830841: am 0536cbb4: am b15f499b: Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev
* commit '7e83084118875a79b820631b424d3989571d17dc':
  Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
2015-03-12 00:52:38 +00:00
Deepanshu Gupta
7e83084118 am 0536cbb4: am b15f499b: Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev
* commit '0536cbb4690578b60ae0db934f4b7bfbc2f36ec2':
  Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
2015-03-12 00:45:24 +00:00
Deepanshu Gupta
0536cbb469 am b15f499b: Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev
* commit 'b15f499b972ec3d09ac36feb15d5535c1b6cd030':
  Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
2015-03-12 00:39:11 +00:00
Deepanshu Gupta
b15f499b97 Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev 2015-03-12 00:33:15 +00:00
Xavier Ducrohet
a244c58a5d am d0598e91: am 5db57146: am aeb400d3: Reset support version to <API>.0.0
* commit 'd0598e911340c77194d315a2b6ad05c7afa9c1ec':
  Reset support version to <API>.0.0
2015-03-11 17:24:13 +00:00
Deepanshu Gupta
06f472a302 Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
Change-Id: I5060825f330a2da9234744510aa45eb283509113
2015-03-10 17:59:16 -07:00
Xavier Ducrohet
d0598e9113 am 5db57146: am aeb400d3: Reset support version to <API>.0.0
* commit '5db57146cdf8498dfefc12153fed2a3b19968dde':
  Reset support version to <API>.0.0
2015-03-10 23:11:19 +00:00
Xavier Ducrohet
5db57146cd am aeb400d3: Reset support version to <API>.0.0
* commit 'aeb400d30cbbc9d48689de3b75f92855f88d0861':
  Reset support version to <API>.0.0
2015-03-10 23:05:31 +00:00
Xavier Ducrohet
aeb400d30c Reset support version to <API>.0.0
Change-Id: I740e937ee51fcbcd0aafc054138f8939110d7cb6
2015-03-10 15:24:16 -07:00
Xavier Ducrohet
e66b671dc7 am 3565380e: am 2762443c: Merge "Mips system image also supports gpu."
* commit '3565380e47cb2b471e390f0644c5953fe6758412':
  Mips system image also supports gpu.
2015-03-09 19:27:11 +00:00
Xavier Ducrohet
3565380e47 am 2762443c: Merge "Mips system image also supports gpu."
* commit '2762443cedb8703c9cd6da1382f3e93c20848868':
  Mips system image also supports gpu.
2015-03-09 19:23:14 +00:00
Xavier Ducrohet
2762443ced Merge "Mips system image also supports gpu." 2015-03-09 19:06:46 +00:00
Xavier Ducrohet
05d097e1e7 am c4abfa22: am 3dbe2f82: am d9273517: Update version of the build tools to be 22.0.0
* commit 'c4abfa22c2b0d2b8773826a6c5ed5b64d8a1bc6a':
  Update version of the build tools to be 22.0.0
2015-03-03 01:03:23 +00:00
Craig Stout
053eb7e946 am d07078d2: am aaa3fa06: Default to using wrap content for row height.
* commit 'd07078d2afbe2a30371ad32fba734f971ad9c669':
  Default to using wrap content for row height.
2015-03-03 00:59:36 +00:00
Xavier Ducrohet
c4abfa22c2 am 3dbe2f82: am d9273517: Update version of the build tools to be 22.0.0
* commit '3dbe2f827c219573c533b40fadfab908d785f0d2':
  Update version of the build tools to be 22.0.0
2015-03-03 00:58:46 +00:00
Xavier Ducrohet
3dbe2f827c am d9273517: Update version of the build tools to be 22.0.0
* commit 'd927351738285e17d0be3b4de6f90107e27764ec':
  Update version of the build tools to be 22.0.0
2015-03-03 00:53:52 +00:00
Craig Stout
d07078d2af am aaa3fa06: Default to using wrap content for row height.
* commit 'aaa3fa06b1ac88db5769e8f24f2c7524992fd661':
  Default to using wrap content for row height.
2015-03-03 00:52:34 +00:00
Xavier Ducrohet
d927351738 Update version of the build tools to be 22.0.0
Change-Id: I8c6c1ce2cd78665c7e9e806fabc3e6b94795cfa4
2015-03-02 16:08:59 -08:00
Craig Stout
aaa3fa06b1 Default to using wrap content for row height.
Change-Id: I902b292726bdf8fa1d2134b00fde1385cbccc4ae
(cherry picked from commit 24ad89cd2b)
2015-03-03 00:04:15 +00:00
Craig Stout
d7eb2ab195 am 12f481fb: am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev
* commit '12f481fb8958846766ecbb420d5b429c72cd83eb':
  Updated to clarify division of functionality.
2015-02-27 16:41:54 +00:00
Geoff Mendal
222dead36e am dd4dc51a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit 'dd4dc51a25d97d45e661dcb8d245a816413ec9e5':
  Import translations. DO NOT MERGE
2015-02-27 16:39:46 +00:00
Craig Stout
12f481fb89 am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev
* commit '5f6a8c4cbc6a0029663eb9e4fe517766b79e5c7f':
  Updated to clarify division of functionality.
2015-02-27 16:34:55 +00:00
Craig Stout
5f6a8c4cbc Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev 2015-02-27 16:25:23 +00:00
Geoff Mendal
dd4dc51a25 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 07:26:04 +00:00
Geoff Mendal
e3e13c36a3 Import translations. DO NOT MERGE
Change-Id: I44190f89c510bb0307eedda601ceaedcbe0b8baa
Auto-generated-cl: translation import
2015-02-26 17:24:12 -08:00
Geoff Mendal
bb43771d78 am ee5bd86e: (-s ours) Import translations. DO NOT MERGE
* commit 'ee5bd86e43c9beba24bc6c254c6e131fc23b473b':
  Import translations. DO NOT MERGE
2015-02-26 23:14:28 +00:00
Geoff Mendal
ee5bd86e43 Import translations. DO NOT MERGE
Change-Id: I3a40482175025bb0c4d4882e13020f7647f93376
Auto-generated-cl: translation import
2015-02-26 12:26:58 -08:00
Dake Gu
602c691090 am 6efdf6b7: am 69cabd12: ItemClickedListener -> ItemViewClickedListener
* commit '6efdf6b750429d6367ea161c537a64735cb8754e':
  ItemClickedListener -> ItemViewClickedListener
2015-02-26 00:57:05 +00:00
Dake Gu
6efdf6b750 am 69cabd12: ItemClickedListener -> ItemViewClickedListener
* commit '69cabd12e65bcebd2e1970bee03fa5b0535a4405':
  ItemClickedListener -> ItemViewClickedListener
2015-02-26 00:50:58 +00:00
Dake Gu
69cabd12e6 ItemClickedListener -> ItemViewClickedListener
Bug 19514090

Change-Id: Icf14e483b95d1bf5d57af9f27d977b0fdb686e67
2015-02-25 15:39:17 -08:00
Jim Miller
71abf35501 am 34bdc613: am fe07a079: am 18c5fb7c: Fix the build
* commit '34bdc6136f13d01af339fd0c8f1f569bb28d6971':
  Fix the build
2015-02-25 19:04:55 +00:00
Jim Miller
34bdc6136f am fe07a079: am 18c5fb7c: Fix the build
* commit 'fe07a079cad85aedba137dc6fca6b9c976844046':
  Fix the build
2015-02-25 18:58:43 +00:00
Jim Miller
fe07a079ca am 18c5fb7c: Fix the build
* commit '18c5fb7c2cb649b355eff5fc33022516e5af150c':
  Fix the build
2015-02-25 18:52:03 +00:00
Jim Miller
18c5fb7c2c Fix the build
This API was hidden for MR1.

Bug 19461292

Change-Id: Ib0a5ca536e843c91a142faeeccf684294aa3e274
2015-02-25 10:37:37 -08:00
Dan Albert
5e6df5ab2a am f1c280b4: am 7ce263a8: Merge "Make adb_api.h safe to include first."
* commit 'f1c280b4c15b60308141093eff0c6b96a347e186':
  Make adb_api.h safe to include first.
2015-02-25 16:52:57 +00:00
Dan Albert
f1c280b4c1 am 7ce263a8: Merge "Make adb_api.h safe to include first."
* commit '7ce263a8512d2abe92957061c55fae383af88d44':
  Make adb_api.h safe to include first.
2015-02-25 05:38:55 +00:00
Dan Albert
7ce263a851 Merge "Make adb_api.h safe to include first." 2015-02-25 05:32:47 +00:00
Dan Albert
28f76a9b1b Make adb_api.h safe to include first.
Change-Id: I0fd2e3c52c69f67d7cd2b24ffcfa764613817b6f
2015-02-24 16:40:45 -08:00
Chris Banes
abdd0b39b7 am c841e38f: am 9ad1e854: Update sdk.atree for new Palette dir structure
* commit 'c841e38f88db355c93c8e7372b15de3ae3d05715':
  Update sdk.atree for new Palette dir structure
2015-02-24 14:46:34 +00:00
Chris Banes
c841e38f88 am 9ad1e854: Update sdk.atree for new Palette dir structure
* commit '9ad1e8546680a70e05e5cff315da2428bf5e1548':
  Update sdk.atree for new Palette dir structure
2015-02-24 14:38:54 +00:00