Commit Graph

12877 Commits

Author SHA1 Message Date
Yohann Roussel
a6ca3cf29f Add multidex ADT project to SDK.
Change-Id: I7d622886441589002da55522ec391f19cae79da0
2013-08-22 18:34:41 +02:00
The Android Automerger
ccc84a24aa merge in klp-release history after reset to klp-dev 2013-08-22 06:00:42 -07:00
Brett Chabot
2be8802d48 am ab53bde8: am dfc82ebe: Merge "Find install artifacts using GET-INSTALL-PATH." into klp-dev
* commit 'ab53bde8911e7f6e32e6f6652ae2af9f1be3e35f':
  Find install artifacts using GET-INSTALL-PATH.
2013-08-21 20:16:15 -07:00
Brett Chabot
ab53bde891 am dfc82ebe: Merge "Find install artifacts using GET-INSTALL-PATH." into klp-dev
* commit 'dfc82ebe7db366e6e3b717fc1d9d60edd6e1c8c8':
  Find install artifacts using GET-INSTALL-PATH.
2013-08-21 20:11:26 -07:00
Brett Chabot
dfc82ebe7d Merge "Find install artifacts using GET-INSTALL-PATH." into klp-dev 2013-08-22 01:13:28 +00:00
Baligh Uddin
e4615ae08d Import translations. DO NOT MERGE
Change-Id: I3ee7318d1d1a1f395b2827e2e81101c4c149b549
Auto-generated-cl: translation import
2013-08-21 15:48:52 -07:00
Mathew Inwood
260f2c0599 am 6901ab38: am af73d576: Remove ApplicationsProvider.
* commit '6901ab3867bbfd723e09985bad7772820b0bed8d':
  Remove ApplicationsProvider.
2013-08-21 09:39:14 -07:00
Mathew Inwood
6901ab3867 am af73d576: Remove ApplicationsProvider.
* commit 'af73d576e9744a8d32c64b66bf8bdd6c3e0f1881':
  Remove ApplicationsProvider.
2013-08-21 09:36:08 -07:00
Mathew Inwood
af73d576e9 Remove ApplicationsProvider.
ApplicationsProvider is going away since it's no longer needed. Remove it
from test config first.

Bug: 10407790
Change-Id: Ia2e6823e88bc66096e9dc6df0fcc2aef396454fc
2013-08-21 17:05:40 +01:00
The Android Automerger
5ee27e5287 merge in klp-release history after reset to klp-dev 2013-08-21 06:01:39 -07:00
Yohann Roussel
9e27887b60 Include android-support-multidex in SDK libs.
Change-Id: I6d55e654cfc69276913d2d287211b474a5c3d00f
2013-08-21 14:21:57 +02:00
Brett Chabot
5f5928cc42 Find install artifacts using GET-INSTALL-PATH.
Change-Id: I7eb3229885df814ab25eb445f40963859b163bf1
2013-08-20 17:07:52 -07:00
Tom O'Neill
0a3537f881 am aad48db9: am cf06a033: Merge "Settings injector sample activity" into klp-dev
* commit 'aad48db964855c31e8f440c30cc3795d32d12703':
  Settings injector sample activity
2013-08-20 07:20:35 -07:00
Tom O'Neill
aad48db964 am cf06a033: Merge "Settings injector sample activity" into klp-dev
* commit 'cf06a033d01c4f518c7bdc4c7cc063a24baa4249':
  Settings injector sample activity
2013-08-20 07:18:33 -07:00
Tom O'Neill
cf06a033d0 Merge "Settings injector sample activity" into klp-dev 2013-08-20 14:16:04 +00:00
The Android Automerger
5f40b7f6b1 merge in klp-release history after reset to klp-dev 2013-08-20 06:00:56 -07:00
Jeff Brown
301b56fe9c am 89e2ff49: am bd278677: Merge "Fix NPE in sample code." into klp-dev
* commit '89e2ff4986f65198e2b7ee65333e6744ca2dfe55':
  Fix NPE in sample code.
2013-08-19 13:39:53 -07:00
Jeff Brown
89e2ff4986 am bd278677: Merge "Fix NPE in sample code." into klp-dev
* commit 'bd278677694ae13e1a6d532a9bab954f74bba4b0':
  Fix NPE in sample code.
2013-08-19 13:38:21 -07:00
Jeff Brown
bd27867769 Merge "Fix NPE in sample code." into klp-dev 2013-08-19 20:36:42 +00:00
Tom O'Neill
3b8f424558 Settings injector sample activity
- Tests implementation of b/10287745

Change-Id: I5bf3323be78a16b660eadb96eadc6bf29197ace5
2013-08-19 13:13:34 -07:00
Baligh Uddin
ca887dcce7 Merge "Import translations. DO NOT MERGE" 2013-08-19 19:52:50 +00:00
Baligh Uddin
a2ab2642d9 Merge "Import translations. DO NOT MERGE" 2013-08-19 19:52:17 +00:00
Vinit Deshapnde
e739d27975 am 0f268d09: am 24fa6aa6: Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev
* commit '0f268d0935db91fb8f1653b3db44e612847d78a6':
  Expose WifiManager.setTdlsEnabled public API
2013-08-19 12:20:53 -07:00
Vinit Deshapnde
0f268d0935 am 24fa6aa6: Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev
* commit '24fa6aa6d9d04fc0cde8febb8eb46f731712542f':
  Expose WifiManager.setTdlsEnabled public API
2013-08-19 12:19:15 -07:00
Vinit Deshapnde
24fa6aa6d9 Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev 2013-08-19 19:14:04 +00:00
Baligh Uddin
970abae927 Import translations. DO NOT MERGE
Change-Id: I0c334e86677a2418afb7b0003db3a55f534bbe36
Auto-generated-cl: translation import
2013-08-19 11:53:06 -07:00
Baligh Uddin
4c953afc9a Import translations. DO NOT MERGE
Change-Id: I16b13f9ab686ae7957542698a6a917848e599b03
Auto-generated-cl: translation import
2013-08-19 11:46:04 -07:00
The Android Automerger
179a6c3b9a merge in klp-release history after reset to klp-dev 2013-08-19 06:01:14 -07:00
Jeff Brown
5768b156c2 Fix NPE in sample code.
Change-Id: I61b348192cd39813027ae5b4d2cedb2e84b701f1
2013-08-16 21:07:09 -07:00
Vinit Deshapnde
9bfdb7e110 Expose WifiManager.setTdlsEnabled public API
Bug: 10221775

Change-Id: I559e4a2afd525a03c8a13fd151eca4638426d03e
2013-08-16 17:20:45 -07:00
Trevor Johns
c9e1ed46a8 am 2babdc60: am 7fb77fa7: am 092959b2: am 1edc4427: am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev
* commit '2babdc60d2f9d482d3518f30035777fbff422a1e':
  Add common directory to BasicSyncAdapter sample
2013-08-15 15:32:04 -07:00
Trevor Johns
2babdc60d2 am 7fb77fa7: am 092959b2: am 1edc4427: am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev
* commit '7fb77fa79a43fed5fc9558e69944b29681544cba':
  Add common directory to BasicSyncAdapter sample
2013-08-15 15:29:28 -07:00
Trevor Johns
7fb77fa79a am 092959b2: am 1edc4427: am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev
* commit '092959b2a1d876511410cc6a85576545457d1037':
  Add common directory to BasicSyncAdapter sample
2013-08-15 15:26:29 -07:00
Trevor Johns
092959b2a1 am 1edc4427: am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev
* commit '1edc4427a1c4861b030bbd0d431f3e19f2fc2450':
  Add common directory to BasicSyncAdapter sample
2013-08-15 15:23:03 -07:00
Trevor Johns
1edc4427a1 am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev
* commit '6a3067db2014f3e582db8243bb82a4c1aad5bd07':
  Add common directory to BasicSyncAdapter sample
2013-08-15 15:19:38 -07:00
Trevor Johns
6a3067db20 Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev 2013-08-15 22:15:11 +00:00
The Android Automerger
dee9d9e43c merge in klp-release history after reset to klp-dev 2013-08-15 06:00:39 -07:00
The Android Open Source Project
9485b911ca am 2663b14f: (-s ours) Reconcile with klp-release - do not merge
* commit '2663b14f0f31038d718bbfe0fc203c1b792fcf47':
  Revert "Monkey support for swipes from the sides of a device."
2013-08-14 15:14:37 -07:00
The Android Open Source Project
2663b14f0f Reconcile with klp-release - do not merge
Change-Id: I81b4f63de93e75fa9553ffce9c2a8de697ca6d50
2013-08-14 15:10:02 -07:00
Chong Zhang
467774b3fd am 3f5aec9c: am 678188ae: am 0efb0345: am 620b29a5: media router sample: handle remote volume change
* commit '3f5aec9ce3432d9cebd7e8c684578e31755d2d76':
  media router sample: handle remote volume change
2013-08-14 13:12:37 -07:00
Chong Zhang
3f5aec9ce3 am 678188ae: am 0efb0345: am 620b29a5: media router sample: handle remote volume change
* commit '678188aee0b5b9156403ad03e214aef498aaee25':
  media router sample: handle remote volume change
2013-08-14 13:10:33 -07:00
Chong Zhang
678188aee0 am 0efb0345: am 620b29a5: media router sample: handle remote volume change
* commit '0efb03459019ef2aca41e94fe14366199a363597':
  media router sample: handle remote volume change
2013-08-14 13:07:14 -07:00
Chong Zhang
0efb034590 am 620b29a5: media router sample: handle remote volume change
* commit '620b29a566e87ce7bb21223150ff97f919fee836':
  media router sample: handle remote volume change
2013-08-14 13:03:29 -07:00
Chong Zhang
620b29a566 media router sample: handle remote volume change
Change-Id: Ie31c24d80b0ae74d68e3ff6f6098d4f0219c391d
(cherry picked from commit 4917691795)
2013-08-14 19:58:57 +00:00
Chong Zhang
9fe422d9d2 Merge "media router sample: handle remote volume change" 2013-08-14 19:58:30 +00:00
Tor Norbye
64e3164434 Merge "Add typedef removal tool" 2013-08-14 17:12:54 +00:00
The Android Automerger
64d30f9b52 merge in klp-release history after reset to klp-dev 2013-08-14 06:05:04 -07:00
Chong Zhang
4917691795 media router sample: handle remote volume change
Change-Id: Ie31c24d80b0ae74d68e3ff6f6098d4f0219c391d
2013-08-13 19:12:17 -07:00
Xavier Ducrohet
87bb83ca14 am c5f94733: am f6e246a8: am 40e5d9df: am bc516abe: am 8791785c: Package Renderscript files for support mode.
* commit 'c5f9473323336efbcc0cbad953aaf357107a5cef':
  Package Renderscript files for support mode.
2013-08-13 17:10:48 -07:00
Xavier Ducrohet
c5f9473323 am f6e246a8: am 40e5d9df: am bc516abe: am 8791785c: Package Renderscript files for support mode.
* commit 'f6e246a8350492eceab4533e0f91e7f9fa4ae91b':
  Package Renderscript files for support mode.
2013-08-13 17:09:12 -07:00