Jeff Brown
1c1cf7b02b
am 1c1a36cf: Merge "Update media router API." into jb-mr2-dev
...
* commit '1c1a36cfa59a48f5f07d48dfa191d0394cf7ff9e':
Update media router API.
2013-05-13 17:38:55 -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
51b656b597
am bad1d933: (-s ours) am 9092b530: am fae6eb7a: (-s ours) am 5f1aa33a: am 44bafdcc: Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-dev
...
* commit 'bad1d933efa1ebac1262377d07a0fe1869a8357c':
DO NOT MERGE. Example code for FileProvider.
2013-05-13 11:53:58 -07:00
Xavier Ducrohet
bad1d933ef
am 9092b530: am fae6eb7a: (-s ours) am 5f1aa33a: am 44bafdcc: Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-dev
...
* commit '9092b530518437d1f51fbd73e4cabf9666e8035d':
DO NOT MERGE. Example code for FileProvider.
2013-05-13 11:50:34 -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
b716d271e9
am 9b09b278: (-s ours) am 53cc4b0b: am acbf6e2e: (-s ours) am 224f6ae7: am 9cac156c: Move support lib to 13. do not merge.
...
* commit '9b09b2789857e771e0d871b71857cfb1b9fc658d':
Move support lib to 13. do not merge.
2013-05-13 10:37:25 -07:00
Xavier Ducrohet
9b09b27898
am 53cc4b0b: am acbf6e2e: (-s ours) am 224f6ae7: am 9cac156c: Move support lib to 13. do not merge.
...
* commit '53cc4b0b606666c51e939f4980bebd37b3befcae':
Move support lib to 13. do not merge.
2013-05-13 10:34:16 -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
9ecda6617e
am 617cf35c: am 2d7f45c9: am 1aa17274: am a50fc7f1: am 138f3a31: add nav drawer sample
...
* commit '617cf35cb63e42ef59978b5a179660e292be308c':
add nav drawer sample
2013-05-10 15:17:03 -07:00
Scott Main
617cf35cb6
am 2d7f45c9: am 1aa17274: am a50fc7f1: am 138f3a31: add nav drawer sample
...
* commit '2d7f45c9aea96f15e273fbff5ff917ac88c31d0f':
add nav drawer sample
2013-05-10 13:43:16 -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
Dianne Hackborn
f25ca509d5
New API demo for UndoManager.
...
Change-Id: Ic49211c771db275f27ceefa5372b005a357fce21
2013-05-07 15:05:15 -07:00
Dirk Dougherty
0d73759171
am 5f5cf779: am fe653b68: 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 '5f5cf779958f3f46f67f6cb0ef61d04b1a19bbb0':
2013-05-07 10:25:18 -07:00
Dirk Dougherty
504cc87eb6
am 33cda41c: am d4dddf53: 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 '33cda41cf9ad1c1fac947301780f1aa42f93cbb6':
Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
2013-05-07 10:25:17 -07:00
Scott Main
90128a494c
am 69abe53c: am 53410053: am d3a35af8: am fabec0c1: am 226d3cec: am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
...
* commit '69abe53c903eb085a33dfc62e2df64c5ea7f4fc4':
2013-05-07 10:18:51 -07:00
Scott Main
79fdec1ec8
am ee04654b: am aa578462: am 9a42242a: am 732c9d39: am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
...
* commit 'ee04654bad5780a736a1ba99ff5ef448686664ae':
add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
2013-05-07 10:18:46 -07:00
Dianne Hackborn
0ee6ec4a73
am 9fc47763: am cb8739c5: Debugging help for issue #8734824 : WATCHDOG KILLING SYSTEM PROCESS
...
* commit '9fc47763c53ab1dd5b424a0857b962aafe9d17d4':
Debugging help for issue #8734824 : WATCHDOG KILLING SYSTEM PROCESS
2013-05-07 10:00:55 -07:00
Dirk Dougherty
5f5cf77995
am fe653b68: 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 'fe653b68d92edf1629fc928c441bfee145e58e8c':
2013-05-06 19:06:07 -07:00
Dirk Dougherty
33cda41cf9
am d4dddf53: 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 'd4dddf53e6de2c4dc69d08ff0e00d7cc144c4931':
Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
2013-05-06 19:06:06 -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
69abe53c90
am 53410053: am d3a35af8: am fabec0c1: am 226d3cec: am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
...
* commit '534100530c1bc53b797676fbeb56c376756b9312':
2013-05-06 17:44:34 -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
ee04654bad
am aa578462: am 9a42242a: am 732c9d39: am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
...
* commit 'aa578462008b82b33cf57d8a344e919a99fd67b0':
add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
2013-05-06 17:24:34 -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
