Commit Graph

11881 Commits

Author SHA1 Message Date
Dirk Dougherty
3799e7376e am 6465f504: am 69abf615: Add redirects for edu urls.
* commit '6465f50405c552621bd1888bc32226892ae35cb7':
  Add redirects for edu urls.
2013-05-15 06:41:01 -07:00
Dirk Dougherty
6465f50405 am 69abf615: Add redirects for edu urls.
* commit '69abf615cec2734c17e677b579471f6475718880':
  Add redirects for edu urls.
2013-05-15 06:38:31 -07:00
Dirk Dougherty
69abf615ce Add redirects for edu urls.
Change-Id: I549cfba56a4865b0eac2f308b489000b9db9497c
2013-05-15 04:26:57 -07:00
Jeff Brown
1c1a36cfa5 Merge "Update media router API." into jb-mr2-dev 2013-05-14 00:33:58 +00:00
Jeff Brown
5d41beb706 Update media router API.
Bug: 8175766
Change-Id: Ie780c6c6309d111019ddf7ba37612c09242b923e
2013-05-13 16:59:32 -07:00
Xavier Ducrohet
9092b53051 am fae6eb7a: (-s ours) am 5f1aa33a: am 44bafdcc: Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-dev
* commit 'fae6eb7aa41b4bfb59d95e5f01c1e025c137f871':
  DO NOT MERGE. Example code for FileProvider.
2013-05-13 11:47:24 -07:00
Xavier Ducrohet
fae6eb7aa4 am 5f1aa33a: am 44bafdcc: Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-dev
* commit '5f1aa33aa321f61ba9b5cffbef6d80ae79c55455':
  DO NOT MERGE. Example code for FileProvider.
2013-05-13 11:44:39 -07:00
Xavier Ducrohet
5f1aa33aa3 am 44bafdcc: Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-dev
* commit '44bafdcc06fed659a74d697e7fb1f610a06d4379':
  DO NOT MERGE. Example code for FileProvider.
2013-05-13 11:42:06 -07:00
Xavier Ducrohet
44bafdcc06 Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-dev 2013-05-13 18:40:48 +00:00
Jeff Sharkey
739532e2c7 DO NOT MERGE. Example code for FileProvider.
Shows simple usage of FileProvider to share a private thumbnail
across process boundaries.  Also serves as sample code for javadoc
on FileProvider.

Bug: 7005318
Change-Id: I0ca12977a3832c7c2ac1c254d411a547ffee0a51
2013-05-13 11:38:44 -07:00
Xavier Ducrohet
53cc4b0b60 am acbf6e2e: (-s ours) am 224f6ae7: am 9cac156c: Move support lib to 13. do not merge.
* commit 'acbf6e2ef6899d4c62318a37e18156ba4cbc5609':
  Move support lib to 13. do not merge.
2013-05-13 10:29:21 -07:00
Xavier Ducrohet
acbf6e2ef6 am 224f6ae7: am 9cac156c: Move support lib to 13. do not merge.
* commit '224f6ae7ba3f501e110b3297e431a33b37a22737':
  Move support lib to 13. do not merge.
2013-05-13 10:27:10 -07:00
Xavier Ducrohet
224f6ae7ba am 9cac156c: Move support lib to 13. do not merge.
* commit '9cac156c877c2ec838eb2b72a2b8182f5cfa447f':
  Move support lib to 13. do not merge.
2013-05-13 10:25:20 -07:00
Xavier Ducrohet
9cac156c87 Move support lib to 13. do not merge.
Change-Id: Icf097a38d102cf1684f64b737fcda2d4fa18068d
2013-05-13 10:22:33 -07:00
Scott Main
2d7f45c9ae am 1aa17274: am a50fc7f1: am 138f3a31: add nav drawer sample
* commit '1aa17274e000e306995db13605556060fb7c4664':
  add nav drawer sample
2013-05-10 13:41:44 -07:00
Scott Main
1aa17274e0 am a50fc7f1: am 138f3a31: add nav drawer sample
* commit 'a50fc7f10f92fa461441a671c5b6d8bb15e8fc61':
  add nav drawer sample
2013-05-10 13:39:44 -07:00
Scott Main
a50fc7f10f am 138f3a31: add nav drawer sample
* commit '138f3a3139182b229a39ab134348521aa61aa40a':
  add nav drawer sample
2013-05-10 13:37:52 -07:00
Scott Main
138f3a3139 add nav drawer sample
Change-Id: I561c7577554c587b4ecacfc6f22fc2beefce27b1
2013-05-10 13:16:09 -07:00
Dirk Dougherty
fe653b68d9 am 3d5b4b8c: am a06feb5d: am b98e5bb9: am 32bd1410: am 4df667f4: Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
* commit '3d5b4b8c731e8de27561a73ad4099636480751a5':
2013-05-06 19:03:53 -07:00
Dirk Dougherty
d4dddf53e6 am 4561ea57: am 04ed3fe8: am 32bd1410: am 4df667f4: Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
* commit '4561ea57ef9d075c04f00f765901a1d3de9e11b4':
  Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
2013-05-06 19:03:52 -07:00
Dirk Dougherty
3d5b4b8c73 am a06feb5d: am b98e5bb9: am 32bd1410: am 4df667f4: Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
* commit 'a06feb5db54f431c8b4b15db6fb6e30a1d50ad22':
2013-05-06 18:58:15 -07:00
Dirk Dougherty
4561ea57ef am 04ed3fe8: am 32bd1410: am 4df667f4: Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
* commit '04ed3fe8a837b8914aba166ea9c46d8a3e44df13':
  Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
2013-05-06 18:58:14 -07:00
Dirk Dougherty
a06feb5db5 am b98e5bb9: am 32bd1410: am 4df667f4: Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
* commit 'b98e5bb928a745287b5e3418ab05d927ceab31fe':
2013-05-06 18:55:21 -07:00
Dirk Dougherty
04ed3fe8a8 am 32bd1410: am 4df667f4: Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
* commit '32bd1410bce06aed02531e9289b957ab401ec8a1':
  Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
2013-05-06 18:54:36 -07:00
Dirk Dougherty
b98e5bb928 am 32bd1410: am 4df667f4: Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
* commit '32bd1410bce06aed02531e9289b957ab401ec8a1':
  Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
2013-05-06 18:53:56 -07:00
Dirk Dougherty
32bd1410bc am 4df667f4: Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
* commit '4df667f498ccdcde28a572a5e45c8324e3d1c598':
  Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
2013-05-06 18:52:20 -07:00
Dirk Dougherty
4df667f498 Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
Change-Id: I1fada8710a43a9ac8d3d2d12a53023e78d686513
2013-05-06 18:44:36 -07:00
Scott Main
534100530c am d3a35af8: am fabec0c1: am 226d3cec: am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
* commit 'd3a35af8d8d09755e8635eb0a0c183617a9ef927':
2013-05-06 17:33:54 -07:00
Scott Main
d3a35af8d8 am fabec0c1: am 226d3cec: am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
* commit 'fabec0c1aeced85609c08f61ca21a8dad169b622':
2013-05-06 17:27:27 -07:00
Scott Main
aa57846200 am 9a42242a: am 732c9d39: am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
* commit '9a42242a579f1ef1ffb5725cd9d590161e894cdb':
  add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
2013-05-06 17:22:23 -07:00
Scott Main
fabec0c1ae am 226d3cec: am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
* commit '226d3cec41243445cadd8171108145dfb2c5eda3':
2013-05-06 17:21:00 -07:00
Scott Main
9a42242a57 am 732c9d39: am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
* commit '732c9d39c1894b8413a167fd4fc5f0d4c87d9b0f':
  add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
2013-05-06 17:19:59 -07:00
Scott Main
226d3cec41 am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
* commit '7581d0aae28a291a529d0ef3ab2960a65831bb2a':
  add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
2013-05-06 17:18:58 -07:00
Scott Main
732c9d39c1 am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
* commit '7581d0aae28a291a529d0ef3ab2960a65831bb2a':
  add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
2013-05-06 17:18:25 -07:00
Scott Main
7581d0aae2 am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
* commit '952b2a0f132b90b2fdea43bdc3f5eba0fe4f8464':
  add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
2013-05-06 17:16:27 -07:00
Scott Main
952b2a0f13 add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
Change-Id: I5e13e47788b8e60e68529241e445e99174b096cf
2013-05-06 17:01:39 -07:00
Dianne Hackborn
cb8739c53f Debugging help for issue #8734824: WATCHDOG KILLING SYSTEM PROCESS
The monkey now gets told about system hangs, and does stuff about
it!  Most especially, it can collect a bug report.  Monkey wins!

Change-Id: Ic8350721e715ef21d1ec813c6aff9a83262d5faa
2013-05-06 11:16:34 -07:00
Dirk Dougherty
2cd4b68cab am e84e2a99: am 37e3b1cd: am e1aaf659: am 940e2048: am 299f3fdd: Add redirect for new location docs path.
* commit 'e84e2a99246711a848297f8e4950ebd67d8b27cf':
2013-05-04 12:01:11 -07:00
Dirk Dougherty
2017bfc163 am b732bdc7: am fb908c3d: am 940e2048: am 299f3fdd: Add redirect for new location docs path.
* commit 'b732bdc7781a7cc8065e40c06ba093793a267250':
  Add redirect for new location docs path.
2013-05-04 12:01:10 -07:00
Dirk Dougherty
e84e2a9924 am 37e3b1cd: am e1aaf659: am 940e2048: am 299f3fdd: Add redirect for new location docs path.
* commit '37e3b1cd576dd9b4d61509f8deff6f8d85896bdc':
2013-05-04 11:58:45 -07:00
Dirk Dougherty
b732bdc778 am fb908c3d: am 940e2048: am 299f3fdd: Add redirect for new location docs path.
* commit 'fb908c3d73fb90d49228a8b5de0b482c0086bbf9':
  Add redirect for new location docs path.
2013-05-04 11:58:44 -07:00
Dirk Dougherty
37e3b1cd57 am e1aaf659: am 940e2048: am 299f3fdd: Add redirect for new location docs path.
* commit 'e1aaf659df43b974d691e0f3537773a30de25de4':
2013-05-04 10:58:07 -07:00
Dirk Dougherty
e1aaf659df am 940e2048: am 299f3fdd: Add redirect for new location docs path.
* commit '940e2048ef7acbc27921c6babf36062548b0dffe':
  Add redirect for new location docs path.
2013-05-04 10:55:43 -07:00
Dirk Dougherty
fb908c3d73 am 940e2048: am 299f3fdd: Add redirect for new location docs path.
* commit '940e2048ef7acbc27921c6babf36062548b0dffe':
  Add redirect for new location docs path.
2013-05-04 10:55:33 -07:00
Dirk Dougherty
940e2048ef am 299f3fdd: Add redirect for new location docs path.
* commit '299f3fdddc7f600dba7ccaa93a3add23a115150b':
  Add redirect for new location docs path.
2013-05-04 10:53:52 -07:00
Dirk Dougherty
299f3fdddc Add redirect for new location docs path.
Change-Id: Ic6fa1362889c6f9d216c662a4f6833fb41f6dcaa
2013-05-03 18:27:07 -07:00
Chris Banes
8942438f38 Update Support7Demos for MenuInflater change:
I7a4504aeae2795e8d9d6f4cd4ecd20b8d4ea7602

Change-Id: I4896483669c877f3d8ed05a81d789750b39ab32d
Signed-off-by: Chris Banes <chrisbanes@google.com>
2013-04-30 12:07:57 +01:00
Adam Powell
04c8633dee Update Support7Demos for action bar compat API changes.
Change-Id: I61914ff777a0eada9525db6fad7d53c97303eb36
2013-04-29 17:38:23 -07:00
Michael Wright
a7d5ca6b2e Stop errors being logged erroneously on event predispatch
Change-Id: Ie4d15a7d01b9d63e7db16a2701024e6108eb0cc0
2013-04-22 18:11:08 -07:00
Fabrice Di Meglio
c7023a80c9 Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev 2013-04-20 00:42:58 +00:00