Commit Graph

12877 Commits

Author SHA1 Message Date
Dirk Dougherty
14dc0e7f78 am 2548ceb9: am 8c423d72: Merge "Raise the default max-age for client side caching to 43200 (12hrs)." into jb-mr2-docs
* commit '2548ceb98a8c777ec354db18ed5f5e86558dabca':
  Raise the default max-age for client side caching to 43200 (12hrs).
2013-09-30 18:45:13 -07:00
Dirk Dougherty
2548ceb98a am 8c423d72: Merge "Raise the default max-age for client side caching to 43200 (12hrs)." into jb-mr2-docs
* commit '8c423d7278180de0704943e2a370ce6757fff32e':
  Raise the default max-age for client side caching to 43200 (12hrs).
2013-09-30 18:42:19 -07:00
Dirk Dougherty
8c423d7278 Merge "Raise the default max-age for client side caching to 43200 (12hrs)." into jb-mr2-docs 2013-10-01 01:39:59 +00:00
Dirk Dougherty
cb2e8d0fe8 Raise the default max-age for client side caching to 43200 (12hrs).
Change-Id: I163bf926994928ceafa66b853ed5c2e9731c7f93
2013-09-30 17:26:59 -07:00
Jeff Brown
772d1ee115 am ebc9c692: am ca5521ed: am 5d3d35ee: Always register the RCC even for local playback.
* commit 'ebc9c692f2fdc053e5be82407bc6755cb1153e3b':
  Always register the RCC even for local playback.
2013-09-30 17:10:05 -07:00
Scott Main
1655c15c73 am 53b8075b: am 4e2a591c: am 55462d1b: am 21fc0e7d: redirect old bad class about old bad auth APIs to doc on GoogleAuthUtil
* commit '53b8075b98b16fe501dddff2bf13bbd8c01f8385':
  redirect old bad class about old bad auth APIs to doc on GoogleAuthUtil
2013-09-30 17:09:25 -07:00
Raphael Moll
02e906edf9 am 382966f3: am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."
* commit '382966f30cdd800a1812d39b790cad8a04527157':
  SDK Repository: switch to sdk addon revision 6.
2013-09-30 16:19:38 -07:00
Raphael Moll
382966f30c am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."
* commit '47605d10f9647d21c3b350e944fe0d0f5efdc4e6':
  SDK Repository: switch to sdk addon revision 6.
2013-09-30 16:15:53 -07:00
Raphael Moll
47605d10f9 Merge "SDK Repository: switch to sdk addon revision 6." 2013-09-30 22:22:23 +00:00
Scott Main
58f11c460e am 53b8075b: am 4e2a591c: am 55462d1b: am 21fc0e7d: redirect old bad class about old bad auth APIs to doc on GoogleAuthUtil
* commit '53b8075b98b16fe501dddff2bf13bbd8c01f8385':
  redirect old bad class about old bad auth APIs to doc on GoogleAuthUtil
2013-09-30 14:17:18 -07:00
Raphael Moll
7657a59083 SDK Repository: switch to sdk addon revision 6.
addon-6.xsd changes <extra><revision> from an int (major only)
to a full <revision> element with major.micro.minor (but not
preview part.)

Change-Id: Ia37e75a2c8f86f4ecf36edb218f7e243f66a0b36
2013-09-30 11:57:17 -07:00
The Android Automerger
d3adbcab03 merge in klp-release history after reset to klp-dev 2013-09-29 06:00:46 -07:00
Jeff Brown
ebc9c692f2 am ca5521ed: am 5d3d35ee: Always register the RCC even for local playback.
* commit 'ca5521ed66d3f403d893f087f794b9c595a69593':
  Always register the RCC even for local playback.
2013-09-27 17:58:25 -07:00
Jeff Brown
ca5521ed66 am 5d3d35ee: Always register the RCC even for local playback.
* commit '5d3d35ee89ccd2bc02a65af03d46ea031c8cf73a':
  Always register the RCC even for local playback.
2013-09-27 17:55:55 -07:00
Jeff Brown
5d3d35ee89 Always register the RCC even for local playback.
Change-Id: I6f2ca31b746f9f53ef9aa6edb674514979ad1893
2013-09-28 00:52:07 +00:00
Scott Main
53b8075b98 am 4e2a591c: am 55462d1b: am 21fc0e7d: redirect old bad class about old bad auth APIs to doc on GoogleAuthUtil
* commit '4e2a591cd87b4678ecf74330e2f207692e89c8b9':
  redirect old bad class about old bad auth APIs to doc on GoogleAuthUtil
2013-09-27 16:04:17 -07:00
Scott Main
4e2a591cd8 am 55462d1b: am 21fc0e7d: redirect old bad class about old bad auth APIs to doc on GoogleAuthUtil
* commit '55462d1b145ca658a42c51f4922a697ac8d09dd2':
  redirect old bad class about old bad auth APIs to doc on GoogleAuthUtil
2013-09-27 15:40:05 -07:00
Scott Main
55462d1b14 am 21fc0e7d: redirect old bad class about old bad auth APIs to doc on GoogleAuthUtil
* commit '21fc0e7da9067ecdb99212ff598c95e503cc38cc':
  redirect old bad class about old bad auth APIs to doc on GoogleAuthUtil
2013-09-27 15:36:43 -07:00
Scott Main
21fc0e7da9 redirect old bad class about old bad auth APIs to doc on GoogleAuthUtil
Change-Id: Icbebe71806f4083a25548180a15c7412867cfa11
2013-09-27 15:27:36 -07:00
The Android Automerger
fc91900259 merge in klp-release history after reset to klp-dev 2013-09-25 06:00:58 -07:00
Jason Sams
f4a89da49a am 97628008: am ef93ca05: Merge "Fix use of dead APIs." into klp-dev
* commit '97628008f4122c596302345318d4b11aba882d62':
  Fix use of dead APIs.
2013-09-24 13:27:25 -07:00
Jason Sams
97628008f4 am ef93ca05: Merge "Fix use of dead APIs." into klp-dev
* commit 'ef93ca055b8dfaeff2304784c376cbb0a6c5f073':
  Fix use of dead APIs.
2013-09-24 13:25:47 -07:00
Jason Sams
ef93ca055b Merge "Fix use of dead APIs." into klp-dev 2013-09-24 20:24:11 +00:00
Jason Sams
d1e8cb25b5 Fix use of dead APIs.
bug 10752757

Change-Id: I8e145f141eb573456d62b32cf8c10387f666635b
2013-09-23 16:05:44 -07:00
The Android Automerger
30f4ca1dc8 merge in klp-release history after reset to klp-dev 2013-09-22 10:50:33 -07:00
Tor Norbye
5b47af05d5 Re-enable typedef stripping
Change-Id: I128b06209223dfc79dc94645847f32df4cd11b1b
2013-09-21 12:37:44 -07:00
Igor Murashkin
8034619c5f am 03c29dcd: am 893289bf: eclipse classpath: update to include frameworks/ex/camera2
* commit '03c29dcd07cae3985388a090a88eb2fc6562f5c2':
  eclipse classpath: update to include frameworks/ex/camera2
2013-09-20 16:30:06 -07:00
Igor Murashkin
03c29dcd07 am 893289bf: eclipse classpath: update to include frameworks/ex/camera2
* commit '893289bf2507111faebff82e5c66b27a392b13ab':
  eclipse classpath: update to include frameworks/ex/camera2
2013-09-20 16:27:37 -07:00
Igor Murashkin
893289bf25 eclipse classpath: update to include frameworks/ex/camera2
Change-Id: Icd72ae70c2e8297a1a9c27a9a0ecc4d96fee81b3
2013-09-19 17:34:42 -07:00
The Android Automerger
a7edd6eaee merge in klp-release history after reset to klp-dev 2013-09-17 21:10:54 -07:00
Andrew Hsieh
91ddbb660f am c517c3dd: am d496950e: am 06485c81: Merge "Move Teapot to android-17 and set APP_ABI := all"
* commit 'c517c3dd34728b31143a3b53362f7eb1f7c9dfd4':
  Move Teapot to android-17 and set APP_ABI := all
2013-09-17 19:29:15 -07:00
Andrew Hsieh
c517c3dd34 am d496950e: am 06485c81: Merge "Move Teapot to android-17 and set APP_ABI := all"
* commit 'd496950e94883a83348df563c1be26fee95bec4f':
  Move Teapot to android-17 and set APP_ABI := all
2013-09-17 18:59:59 -07:00
Andrew Hsieh
d496950e94 am 06485c81: Merge "Move Teapot to android-17 and set APP_ABI := all"
* commit '06485c81bbc79b02acfbe986e378216adab573c2':
  Move Teapot to android-17 and set APP_ABI := all
2013-09-17 18:58:25 -07:00
Andrew Hsieh
06485c81bb Merge "Move Teapot to android-17 and set APP_ABI := all" 2013-09-18 01:55:54 +00:00
Andrew Hsieh
015724d1cb am c0fa6ffa: am 016338e0: am 3199e150: Merge "Fixed array-index-out-of-bound in Teapot sample"
* commit 'c0fa6ffad4b05ef845b4545235db06980827bda5':
  Fixed array-index-out-of-bound in Teapot sample
2013-09-17 18:42:08 -07:00
Andrew Hsieh
c0fa6ffad4 am 016338e0: am 3199e150: Merge "Fixed array-index-out-of-bound in Teapot sample"
* commit '016338e0ec30f566d7659f4ea91bc786cf93845e':
  Fixed array-index-out-of-bound in Teapot sample
2013-09-17 18:40:11 -07:00
Andrew Hsieh
016338e0ec am 3199e150: Merge "Fixed array-index-out-of-bound in Teapot sample"
* commit '3199e1502382a037e6bb9b3ae11429fc18fe9917':
  Fixed array-index-out-of-bound in Teapot sample
2013-09-17 18:38:45 -07:00
Andrew Hsieh
3199e15023 Merge "Fixed array-index-out-of-bound in Teapot sample" 2013-09-18 01:36:02 +00:00
The Android Automerger
cc52140d8e merge in klp-release history after reset to klp-dev 2013-09-17 17:39:43 -07:00
The Android Automerger
7dc8cbe3d8 merge in klp-release history after reset to klp-dev 2013-09-17 06:00:21 -07:00
Alan Viverette
fc2774cbfb am a81b5e68: am ff306b66: Merge "Fix drawer mirroring in Support4Demos" into klp-dev
* commit 'a81b5e68dcd65131c6538ab3cbde6fa4d89b696a':
  Fix drawer mirroring in Support4Demos
2013-09-16 12:34:32 -07:00
Alan Viverette
a81b5e68dc am ff306b66: Merge "Fix drawer mirroring in Support4Demos" into klp-dev
* commit 'ff306b6613111765f33de105db750e33dec60f01':
  Fix drawer mirroring in Support4Demos
2013-09-16 12:30:04 -07:00
Alan Viverette
ff306b6613 Merge "Fix drawer mirroring in Support4Demos" into klp-dev 2013-09-16 19:27:36 +00:00
Ben Cheng
a4953a95a3 Merge "Add "Force a Double Free" button to stress test the tools." 2013-09-16 19:14:28 +00:00
Ben Cheng
f9e0f5b7cf Add "Force a Double Free" button to stress test the tools.
Change-Id: I52bf2f42c9a6040ac345248473d7184b7266f511
2013-09-16 12:12:51 -07:00
The Android Automerger
eb8cc88787 merge in klp-release history after reset to klp-dev 2013-09-16 06:00:42 -07:00
Andrew Hsieh
1b8ffe3331 Move Teapot to android-17 and set APP_ABI := all
For the default configuration to run on more devices: ARM/Intel/MIPS >= API17

Change-Id: I52145374d0c51624c7a295dc8092f8492e591dee
2013-09-16 10:32:55 +08:00
Iceberg Fu
f74a8b0a63 Fixed array-index-out-of-bound in Teapot sample
Fix issue used to crash on MIPS/X86 device.  ARM device works by accident

Change-Id: I401f4954841b6f59d3ea001e5e6a70c46045a7e1
2013-09-16 10:17:17 +08:00
Baligh Uddin
a6a19f49c7 am de7cabb5: (-s ours) am e58ed1e1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'de7cabb59f999b28a304eb1c8dc60274bf480d58':
  Import translations. DO NOT MERGE
2013-09-14 21:44:44 -07:00
Baligh Uddin
f262580317 am 6f8236f4: (-s ours) am 5f059130: (-s ours) Import translations. DO NOT MERGE
* commit '6f8236f423b40bd9c247bdc98e15c9646796af0c':
  Import translations. DO NOT MERGE
2013-09-14 21:44:43 -07:00