Commit Graph

15313 Commits

Author SHA1 Message Date
Deepanshu Gupta
ef43acc413 Package renamed fonts.
PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.

Change-Id: Iac2a34475b095ed38f8706420acda40c5d53364b
2014-05-30 10:38:45 -07:00
Ben Cheng
8683a8e389 am f8ca5a9e: am dc898c78: am 550e4425: Merge "Build both 64- and 32-bit versions."
* commit 'f8ca5a9e22e91e06a3715916189079df33a01ae8':
  Build both 64- and 32-bit versions.
2014-05-30 17:12:16 +00:00
Ben Cheng
f8ca5a9e22 am dc898c78: am 550e4425: Merge "Build both 64- and 32-bit versions."
* commit 'dc898c7838c98dee558aace12c11553ebff2efc7':
  Build both 64- and 32-bit versions.
2014-05-30 17:07:49 +00:00
Ben Cheng
dc898c7838 am 550e4425: Merge "Build both 64- and 32-bit versions."
* commit '550e44253f2eb23b909c80c9a9717c2cc36b4b8b':
  Build both 64- and 32-bit versions.
2014-05-30 17:04:47 +00:00
Ben Cheng
550e44253f Merge "Build both 64- and 32-bit versions." 2014-05-30 17:00:01 +00:00
Ben Cheng
c54a9369f0 Build both 64- and 32-bit versions.
Change-Id: I9e641cebcd71cb680ecb326e8c75e68e7d016ea4
2014-05-30 09:58:47 -07:00
Andrew Hsieh
727ac63f0a Refresh 64-bit headers/libs (WW22)
Change-Id: Ic49750508a4c825e6ac222d8cd417e71dae53cbd
2014-05-30 23:21:02 +08:00
Narayan Kamath
01347d965e am 361fce55: am d9fb901d: am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."
* commit '361fce55866e220380fdf1c81f29e5498b5fa0a7':
  Track changes to IActivityManager.startInstrumentation.
2014-05-30 11:50:55 +00:00
Narayan Kamath
361fce5586 am d9fb901d: am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."
* commit 'd9fb901dc65e6780db5aad1c3bdb53a93dfd371b':
  Track changes to IActivityManager.startInstrumentation.
2014-05-30 10:44:18 +00:00
Narayan Kamath
d9fb901dc6 am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."
* commit '479cf9ff668f04fcc4deb24b115ef766f5115373':
  Track changes to IActivityManager.startInstrumentation.
2014-05-30 10:37:50 +00:00
Narayan Kamath
479cf9ff66 Merge "Track changes to IActivityManager.startInstrumentation." 2014-05-30 10:35:30 +00:00
Narayan Kamath
fc9e3f6878 Track changes to IActivityManager.startInstrumentation.
Change-Id: Iceaecb720c2824134a1d6d13b1f3e0a16d41d76d
2014-05-30 11:33:02 +01:00
Chris Banes
8028b39252 Add android-support-v7-palette to build
Change-Id: I22cec92b976645d766441b140a5d5754c4ebbe46
2014-05-30 10:17:46 +00:00
Yigit Boyar
9c4a7ebc66 am 1d667358: Remove deprecated RecyclerView methods
* commit '1d6673588c5bb9a54a7439ebae1bd38e34979797':
  Remove deprecated RecyclerView methods
2014-05-29 21:19:37 +00:00
Andrew Hsieh
acdb9ff78d am aec2c2dd: am ad3e8475: am 844bc1d3: Merge "Refresh 64-bit headers/libs (WW21)"
* commit 'aec2c2ddc9bdc28bd03e2656afce0b469168f0e1':
  Refresh 64-bit headers/libs (WW21)
2014-05-29 21:09:36 +00:00
Marco Nelissen
8cc9aa8f32 NDK media codec sample
Change-Id: Id7e70cfccdace8bce253bdac4434c42f52ff72f3
2014-05-29 13:12:56 -07:00
Andrew Hsieh
aec2c2ddc9 am ad3e8475: am 844bc1d3: Merge "Refresh 64-bit headers/libs (WW21)"
* commit 'ad3e847512a3f28bc24f2418a97dbb3108c51559':
  Refresh 64-bit headers/libs (WW21)
2014-05-29 19:15:28 +00:00
Andrew Hsieh
ad3e847512 am 844bc1d3: Merge "Refresh 64-bit headers/libs (WW21)"
* commit '844bc1d331a8714fbc54492ed119e0db86555d36':
  Refresh 64-bit headers/libs (WW21)
2014-05-29 19:12:25 +00:00
Andrew Hsieh
844bc1d331 Merge "Refresh 64-bit headers/libs (WW21)" 2014-05-29 19:09:37 +00:00
Yigit Boyar
1d6673588c Remove deprecated RecyclerView methods
Change-Id: If9b0aca85221d64dbbb5cda75f985a91de6c67d2
(cherry picked from commit 67bdb44d98)
2014-05-29 17:53:37 +00:00
Marco Nelissen
d33652a386 getSampletime -> getSampleTime
Change-Id: I089adb8a4050fe72befe272318a903ef93744335
2014-05-29 08:09:16 -07:00
Raphael Moll
cc3aa924e9 am 267ddd50: am 937cfb42: am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
* commit '267ddd50d75c86410ace6537ad3315b1eaaf730b':
  Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 18:01:46 +00:00
Yigit Boyar
bc7b3e0342 am b4c3e94a: (-s ours) am 67bdb44d: DO NOT MERGE Remove deprecated RecyclerView methods
* commit 'b4c3e94a123fa669d45fb9e80f5a0e32ba6968e6':
  DO NOT MERGE Remove deprecated RecyclerView methods
2014-05-28 18:01:41 +00:00
Ben Cheng
f7c5c4167e am c4bbd0a6: am 5f7d9640: am 960a770d: Merge "Move the panorama benchmark from packages/apps/Camera to here."
* commit 'c4bbd0a628ae4cc16051ee7e7e8aca9e8a97cc9b':
  Move the panorama benchmark from packages/apps/Camera to here.
2014-05-28 17:44:15 +00:00
Yigit Boyar
cbb1906438 am b5de9c7b: Added CardView demo to SupportV7 demo app
* commit 'b5de9c7b9d17d90396ec52cb32999698a945b28f':
  Added CardView demo to SupportV7 demo app
2014-05-28 17:22:17 +00:00
Andrew Hsieh
19f647e8a7 Refresh 64-bit headers/libs (WW21)
Change-Id: I013af3ae4adac17d7b2ef5680d41d75dc9799d19
2014-05-28 21:07:45 +08:00
Raphael Moll
267ddd50d7 am 937cfb42: am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
* commit '937cfb42602c081143e1854ba5f67e18b2f97b46':
  Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 01:59:48 +00:00
Raphael Moll
937cfb4260 am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
* commit '6e56697cb229cd8c163583a03259a6787f60a84a':
  Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 01:57:55 +00:00
Raphael Moll
6e56697cb2 Merge "Ability to generate SDK system-images for arm64 and x86_64" 2014-05-28 01:56:17 +00:00
Yigit Boyar
b5de9c7b9d Added CardView demo to SupportV7 demo app
Change-Id: Ie1b81426dc67c67766eb20fb8f1fc984d25a42cf
2014-05-27 18:32:53 -07:00
Yigit Boyar
b4c3e94a12 am 67bdb44d: DO NOT MERGE Remove deprecated RecyclerView methods
* commit '67bdb44d980e6f565f4ec3063a6041bbcbab397c':
  DO NOT MERGE Remove deprecated RecyclerView methods
2014-05-28 01:32:00 +00:00
Yigit Boyar
67bdb44d98 DO NOT MERGE Remove deprecated RecyclerView methods
Change-Id: If9b0aca85221d64dbbb5cda75f985a91de6c67d2
2014-05-28 01:18:25 +00:00
Ben Cheng
c4bbd0a628 am 5f7d9640: am 960a770d: Merge "Move the panorama benchmark from packages/apps/Camera to here."
* commit '5f7d9640ae6fc01b058d5d3f09cf2bad21fb8c74':
  Move the panorama benchmark from packages/apps/Camera to here.
2014-05-28 00:22:28 +00:00
Ben Cheng
5f7d9640ae am 960a770d: Merge "Move the panorama benchmark from packages/apps/Camera to here."
* commit '960a770d6c27bd986b15e8cf7579d10d5ccb2b1d':
  Move the panorama benchmark from packages/apps/Camera to here.
2014-05-28 00:18:20 +00:00
Ben Cheng
960a770d6c Merge "Move the panorama benchmark from packages/apps/Camera to here." 2014-05-28 00:15:35 +00:00
Ben Cheng
4b5b3887b9 Move the panorama benchmark from packages/apps/Camera to here.
Also cut unnecessary dependencies on other parts of Android and build
staticly linked binaries so that the benchmark can be run on barebone
systems.

Change-Id: I69ea59c677c750d1982389dd62a6a74e4719d547
2014-05-27 16:12:56 -07:00
Raphael Moll
4986fd4fdd Ability to generate SDK system-images for arm64 and x86_64
(Cherry-picked from 40c7126e7c)

Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
2014-05-27 16:10:14 -07:00
Marco Nelissen
46ef8b2a8b Media NDK files
Change-Id: Ie41df1949abde194156ab188a662ec7065343d54
2014-05-27 13:07:47 -07:00
Elliott Hughes
6f42309d3b am d7130107: am 95387dd1: am f570883a: Merge "Fix MIPS build."
* commit 'd7130107ae53237c6b743195a7c6fbe63f106c01':
  Fix MIPS build.
2014-05-23 21:42:15 +00:00
Ying Wang
ebd29c68a7 am c5aba030: am df3def70: am 8eaca3a3: Merge "Host multilib build."
* commit 'c5aba03039b8d5ec798c8e6f1d3c44ee88e5c020':
  Host multilib build.
2014-05-23 21:42:12 +00:00
Elliott Hughes
d7130107ae am 95387dd1: am f570883a: Merge "Fix MIPS build."
* commit '95387dd16262fbd730eaafcdebdaeeb0a35ea33a':
  Fix MIPS build.
2014-05-23 21:38:07 +00:00
Ying Wang
c5aba03039 am df3def70: am 8eaca3a3: Merge "Host multilib build."
* commit 'df3def709410b63f8c6d41f0f3d1478d5903392e':
  Host multilib build.
2014-05-23 21:38:06 +00:00
Elliott Hughes
95387dd162 am f570883a: Merge "Fix MIPS build."
* commit 'f570883afaad1887da8c30fbfa51e70ffa6f268e':
  Fix MIPS build.
2014-05-23 21:34:25 +00:00
Ying Wang
df3def7094 am 8eaca3a3: Merge "Host multilib build."
* commit '8eaca3a30e184e235c0dcd0acabb9268a7bf25bf':
  Host multilib build.
2014-05-23 21:34:23 +00:00
Elliott Hughes
f570883afa Merge "Fix MIPS build." 2014-05-23 21:31:18 +00:00
Ying Wang
8eaca3a30e Merge "Host multilib build." 2014-05-23 21:28:26 +00:00
Elliott Hughes
caebfa9b50 Fix MIPS build.
We really ought to remove libportable.

Bug: 14903517
Change-Id: Id96b24bfe329096adffd94d452f440295d8aa83a
2014-05-23 14:24:15 -07:00
The Android Automerger
d1a8309b44 am f61e5d37: merge in master-release history after reset to ec0df8cc31
* commit 'f61e5d37f6cad98004a50d060cdab24caabb90f8':
  Fix win_sdk build.
  Merge "Fix gles3jni build with clang at android-11"
2014-05-23 18:22:19 +00:00
Adrian Roos
dded89c1be Merge "Fix sample device admin" 2014-05-23 10:27:07 +00:00
Evan Charlton
08d98a2587 Merge "Add support for OSX to intellij-gen.sh" 2014-05-22 22:27:33 +00:00