Jeff Brown
9299c6cdd8
Ensure sample runs on Gingerbread. (DO NOT MERGE)
...
Unfortunately, the video does not play due to a MediaPlayer
exception but at least this version does not crash.
Change-Id: I0baf9239a8a12f92b4805bab226f21f46fa63693
(cherry picked from commit 854e16afda )
2013-08-23 03:23:46 +00:00
Jeff Brown
22a994d112
am 854e16af: Ensure sample runs on Gingerbread.
...
* commit '854e16afda1bbacbd5eee7e434059d493879497d':
Ensure sample runs on Gingerbread.
2013-08-22 20:11:55 -07:00
Jeff Brown
854e16afda
Ensure sample runs on Gingerbread.
...
Unfortunately, the video does not play due to a MediaPlayer
exception but at least this version does not crash.
Change-Id: I0baf9239a8a12f92b4805bab226f21f46fa63693
2013-08-22 18:25:58 -07:00
Brett Chabot
859cff17af
am c518764b: Merge "Fix runtest cts-net" into klp-dev
...
* commit 'c518764b02d4b99b06400dd1903019b1f44a78bf':
Fix runtest cts-net
2013-08-22 11:06:36 -07:00
Brett Chabot
c518764b02
Merge "Fix runtest cts-net" into klp-dev
2013-08-22 18:00:37 +00:00
Brett Chabot
315d72f730
Fix runtest cts-net
...
Change-Id: Ia3f7e058c48a8c84e465602e1af172ba75ff1154
2013-08-22 10:26:52 -07: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
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
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
Brett Chabot
5f5928cc42
Find install artifacts using GET-INSTALL-PATH.
...
Change-Id: I7eb3229885df814ab25eb445f40963859b163bf1
2013-08-20 17:07:52 -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
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
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
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
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
2663b14f0f
Reconcile with klp-release - do not merge
...
Change-Id: I81b4f63de93e75fa9553ffce9c2a8de697ca6d50
2013-08-14 15:10:02 -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
The Android Automerger
64d30f9b52
merge in klp-release history after reset to klp-dev
2013-08-14 06:05:04 -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
Xavier Ducrohet
f6e246a835
am 40e5d9df: am bc516abe: am 8791785c: Package Renderscript files for support mode.
...
* commit '40e5d9df5f6f7936ef1b08cfe00d2dfe4c874c8e':
Package Renderscript files for support mode.
2013-08-13 17:06:21 -07:00
Xavier Ducrohet
40e5d9df5f
am bc516abe: am 8791785c: Package Renderscript files for support mode.
...
* commit 'bc516abe801272ebbb6916f6496ef5ca88a20c0f':
Package Renderscript files for support mode.
2013-08-13 17:04:07 -07:00
Xavier Ducrohet
bc516abe80
am 8791785c: Package Renderscript files for support mode.
...
* commit '8791785cd0e7eec775382d44c3ebfe9edaf54ca6':
Package Renderscript files for support mode.
2013-08-13 17:02:47 -07:00
Xavier Ducrohet
8791785cd0
Package Renderscript files for support mode.
...
Change-Id: I4eae052b01ae014f3e4d289ba33893dfd9c43309
2013-08-13 15:57:08 -07:00
The Android Automerger
46d6ef5a3e
merge in klp-release history after reset to klp-dev
2013-08-13 06:01:01 -07:00
Andrew Hsieh
a79d5399f0
am fa73c847: am 54723fb6: Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h"
...
* commit 'fa73c847c34a442e24dbeeff4ae58799b66da97a':
Remove missing functions imaxabs() and imaxdiv() from inttypes.h
2013-08-12 20:31:57 -07:00
Andrew Hsieh
fa73c847c3
am 54723fb6: Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h"
...
* commit '54723fb6ac38cbefd2dbaf8c1e7a892765170d4c':
Remove missing functions imaxabs() and imaxdiv() from inttypes.h
2013-08-12 20:29:07 -07:00
Andrew Hsieh
54723fb6ac
Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h"
2013-08-13 03:26:13 +00:00
Adam Powell
ba321696dd
am e1d4743d: am 3c16ec88: Fix bugs in FragmentLayoutSupport sample in Support4Demos
...
* commit 'e1d4743db13fc4f99f4608876f36d0e44e3f854a':
Fix bugs in FragmentLayoutSupport sample in Support4Demos
2013-08-12 14:02:15 -07:00
Adam Powell
e1d4743db1
am 3c16ec88: Fix bugs in FragmentLayoutSupport sample in Support4Demos
...
* commit '3c16ec88559377128adffbc9748c23de79d7adb5':
Fix bugs in FragmentLayoutSupport sample in Support4Demos
2013-08-12 13:59:09 -07:00
Adam Powell
3c16ec8855
Fix bugs in FragmentLayoutSupport sample in Support4Demos
...
Change-Id: I6b2828f8f6510e34cc11c3dc24b5022b241bd542
2013-08-12 13:50:02 -07:00
Xavier Ducrohet
17f5e46174
am 7353e9f3: (-s ours) am a6b4e7e3: am f46f1a97: Move build tools version to 18.1.0 - do not merge.
...
* commit '7353e9f38de5d6d0dd3faf45ef0bb2b404d3192e':
Move build tools version to 18.1.0 - do not merge.
2013-08-12 11:07:24 -07:00
Xavier Ducrohet
7353e9f38d
am a6b4e7e3: am f46f1a97: Move build tools version to 18.1.0 - do not merge.
...
* commit 'a6b4e7e3b2cfc8ef96191f177391a98f90339048':
Move build tools version to 18.1.0 - do not merge.
2013-08-12 11:04:32 -07:00