Xavier Ducrohet
7bd9087b6c
am efa7ff93: am 032b355a: am b0bedfe4: am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE.
...
* commit 'efa7ff93f1e11b09321fa51a46df2f7820ba6db8':
Update support extra version to 21.0.3 DO NOT MERGE.
2014-12-08 19:35:39 +00:00
RoboErik
2a256b9fed
am ee0da246: am 4424852b: Updates for compatLib changes to MedaiRouter support lib
...
* commit 'ee0da246cd87f91ab8229e78cb9d65508fb9ebda':
Updates for compatLib changes to MedaiRouter support lib
2014-12-08 19:18:28 +00:00
Andrew Hsieh
3835e78ddb
am 08b75cc3: Merge "misc header changes for r10d"
...
* commit '08b75cc3b7ccec1b2eb7d78d5bb49049490f3a37':
misc header changes for r10d
2014-12-08 19:06:37 +00:00
Andrew Hsieh
08b75cc3b7
Merge "misc header changes for r10d"
2014-12-08 02:33:22 +00:00
Xavier Ducrohet
efa7ff93f1
am 032b355a: am b0bedfe4: am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE.
...
* commit '032b355a137307839dfe2b098cd208f00ba4ce15':
Update support extra version to 21.0.3 DO NOT MERGE.
2014-12-05 23:58:29 +00:00
Xavier Ducrohet
032b355a13
am b0bedfe4: am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE.
...
* commit 'b0bedfe4b75af178609525834710a89137dca988':
Update support extra version to 21.0.3 DO NOT MERGE.
2014-12-05 23:53:01 +00:00
Xavier Ducrohet
b0bedfe4b7
am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE.
...
* commit '53c3c2e56ee3ff234eb13362cfbf74203c9334d2':
Update support extra version to 21.0.3 DO NOT MERGE.
2014-12-05 23:45:57 +00:00
Xavier Ducrohet
53c3c2e56e
Update support extra version to 21.0.3 DO NOT MERGE.
...
Change-Id: Id78466d1ef53a303a53bf7b92ed1d290b1b55008
2014-12-05 15:38:39 -08:00
RoboErik
ee0da246cd
am 4424852b: Updates for compatLib changes to MedaiRouter support lib
...
* commit '4424852bbb6e9fd2b3e078cd54b73f6a4ea56a26':
Updates for compatLib changes to MedaiRouter support lib
2014-12-05 22:19:52 +00:00
Andrew Hsieh
6aff78a6ce
misc header changes for r10d
...
1. move sgidefs.h to libc/arch-mips.
See bionic 6e50cb454451916ced315680f6c13dc08cf3959a
2. change type of u_ar0 from "unsigned long" to "struct user_regs_struct*".
See bionic e03950fa0c5567edf70d011b856a027e03b1c0f7
3. sync fts.h, dlext.h, sys/user.h
4. remove ' from string.h
Change-Id: I2ba58b0df4c655f107ea086efbd0220de2b40e9a
2014-12-05 14:11:54 +08:00
RoboErik
4424852bbb
Updates for compatLib changes to MedaiRouter support lib
...
The ControllerDialog in MediaRouter now gets the session token from
the MediaRouter instead of needing it to be set. Removed the calls to
set it directly on the dialog.
bug:18186638
Change-Id: If7499108c226d3405ea70e2f332694a92a921e50
2014-12-04 13:51:26 -08:00
Deepanshu Gupta
0407e185d7
am 9247e323: am 154cfd7a: am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev
...
* commit '9247e32376b0f1d715f176317d15e9c1f1fdc34a':
Add tzdata to SDK build
2014-12-04 20:25:39 +00:00
Craig Stout
b77130e39b
am e5c52cd4: am f4858169: Use non-deprecated HeaderItem constructor.
...
* commit 'e5c52cd4badee3588dfa0d2a30aade3449422589':
Use non-deprecated HeaderItem constructor.
2014-12-04 20:25:25 +00:00
Deepanshu Gupta
9247e32376
am 154cfd7a: am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev
...
* commit '154cfd7a55e432f38c2550cecc2e142fd8d8d782':
Add tzdata to SDK build
2014-12-04 14:54:03 +00:00
Craig Stout
e5c52cd4ba
am f4858169: Use non-deprecated HeaderItem constructor.
...
* commit 'f48581698cdf07afb99918151a11309257838f5b':
Use non-deprecated HeaderItem constructor.
2014-12-04 14:54:01 +00:00
Deepanshu Gupta
154cfd7a55
am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev
...
* commit '7dd11bd0664f7e43c049eba632e390451ddeb64d':
Add tzdata to SDK build
2014-12-04 02:56:53 +00:00
Craig Stout
f48581698c
Use non-deprecated HeaderItem constructor.
...
b/17455376
Change-Id: I9fff76367ffe1f96642a39962e51c935cf39d10b
2014-12-03 17:11:57 -08:00
Deepanshu Gupta
7dd11bd066
am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev
...
* commit 'ca15c4153285d2eb587b0d026c47f57ff36d2fe1':
Add tzdata to SDK build
2014-12-03 20:58:16 +00:00
Deepanshu Gupta
ca15c41532
Merge "Add tzdata to SDK build" into lmp-dev
2014-12-03 20:48:30 +00:00
RoboErik
7604b23cec
am 9bf62048: am d7e30037: Merge "Update for MediaSessionCompat support" into lmp-mr1-dev
...
* commit '9bf620484bcd12fa9a4da605d5263840eeec0758':
Update for MediaSessionCompat support
2014-12-03 20:44:08 +00:00
RoboErik
9bf620484b
am d7e30037: Merge "Update for MediaSessionCompat support" into lmp-mr1-dev
...
* commit 'd7e30037aa719f43d74bb1f706f2df480168e7d0':
Update for MediaSessionCompat support
2014-12-03 19:50:01 +00:00
RoboErik
d7e30037aa
Merge "Update for MediaSessionCompat support" into lmp-mr1-dev
2014-12-03 19:06:05 +00:00
Michael Wright
7dda1047dd
am e9860761: am 2503a62b: Merge "Have the MediaProjection sample use the callback." into lmp-mr1-dev
...
* commit 'e98607612927716a2b3730702f056528d5fd6b29':
Have the MediaProjection sample use the callback.
2014-12-03 02:51:51 +00:00
Michael Wright
e986076129
am 2503a62b: Merge "Have the MediaProjection sample use the callback." into lmp-mr1-dev
...
* commit '2503a62bc3dfda20a81d1e762f68981b8963c678':
Have the MediaProjection sample use the callback.
2014-12-03 02:17:14 +00:00
Michael Wright
2503a62bc3
Merge "Have the MediaProjection sample use the callback." into lmp-mr1-dev
2014-12-03 01:18:26 +00:00
Trevor Johns
c0fa2ee425
am 64a7d19f: am 22ca6ce4: am 15af151e: am f20b9979: am 1ccf8350: DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
...
* commit '64a7d19f92a2b2a5c13564d4e4572af13ef128ab':
DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
2014-12-01 23:24:37 +00:00
Trevor Johns
64a7d19f92
am 22ca6ce4: am 15af151e: am f20b9979: am 1ccf8350: DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
...
* commit '22ca6ce44e6d7d6f0bb31e32d90291642be7a011':
DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
2014-12-01 23:19:28 +00:00
Trevor Johns
22ca6ce44e
am 15af151e: am f20b9979: am 1ccf8350: DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
...
* commit '15af151e05bc642b6cc11c42b73fe6edb9552e39':
DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
2014-12-01 23:13:32 +00:00
RoboErik
e98a5d4e19
Update for MediaSessionCompat support
...
Switches the MediaRouter sample to using MediaSessionCompat instead of
RemoteControlClient. This goes along with the update to the support lib
for full MediaSessionCompat support of RCC.
bug:18186638
Change-Id: If8dd25346b850512ea8d248012d8a369a39d301f
2014-12-01 15:11:20 -08:00
Trevor Johns
15af151e05
am f20b9979: am 1ccf8350: DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
...
* commit 'f20b99791584d7b1291e98b9ed9705b3517605b9':
DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
2014-12-01 23:07:53 +00:00
Trevor Johns
f20b997915
am 1ccf8350: DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
...
* commit '1ccf8350d52bd8d7f480c2c4d46c666356f4a220':
DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
2014-12-01 23:01:41 +00:00
Trevor Johns
1ccf8350d5
DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
...
Setting revision for Coral samples release to r4.
Change-Id: I6096fe36f7fbaa589919ecd0edfcc000ffd4264a
2014-12-01 14:52:57 -08:00
RoboErik
9c6ca8bcf5
am 0e5dcbda: am cdc171cd: Merge "Update the MediaRouter support demo for new UIs" into lmp-mr1-dev
...
* commit '0e5dcbda7599643ca4d21738322aef86d58ecf89':
Update the MediaRouter support demo for new UIs
2014-11-25 18:43:23 +00:00
RoboErik
0e5dcbda75
am cdc171cd: Merge "Update the MediaRouter support demo for new UIs" into lmp-mr1-dev
...
* commit 'cdc171cd042d9ed86b4a8f5d12e561e62cd66106':
Update the MediaRouter support demo for new UIs
2014-11-24 23:09:51 +00:00
RoboErik
cdc171cd04
Merge "Update the MediaRouter support demo for new UIs" into lmp-mr1-dev
2014-11-24 23:04:30 +00:00
Craig Stout
ea39ed879b
am 2f5272c5: am e3e0ff62: Merge "Update sample to use playback control glue." into lmp-mr1-dev
...
* commit '2f5272c5237a07cfa46e4e4afba07fdaf8bd8c79':
Update sample to use playback control glue.
2014-11-21 23:38:27 +00:00
Craig Stout
2f5272c523
am e3e0ff62: Merge "Update sample to use playback control glue." into lmp-mr1-dev
...
* commit 'e3e0ff62623a9549c635ff4cd3748cd810295aa5':
Update sample to use playback control glue.
2014-11-21 23:34:13 +00:00
Craig Stout
e3e0ff6262
Merge "Update sample to use playback control glue." into lmp-mr1-dev
2014-11-21 23:30:42 +00:00
Michael Wright
bcbb01686c
Have the MediaProjection sample use the callback.
...
Bug: 18393320
Change-Id: I482ed9cde5444d62a5486f4ca91e3dc6b441e673
2014-11-21 14:11:52 -08:00
Yigit Boyar
58476e2d52
am dcafbc3b: am 02c6b367: Merge "Remove deprecated API usage" into lmp-mr1-dev
...
* commit 'dcafbc3b0cc6f2a7a2d70a6f887025a8ed447afd':
Remove deprecated API usage
2014-11-21 22:04:08 +00:00
Trevor Johns
0b1eeb9e81
am 9445329c: am 6276d0ac: am d9911fa7: am cdf2a929: am 82ea8a02: Add WatchFace sample to sdk.atree
...
* commit '9445329cd92b16a48c25ffce870021fdeaa0560a':
Add WatchFace sample to sdk.atree
2014-11-21 22:03:57 +00:00
Kris Giesing
fa02e8b7de
am e561c428: am 16324f64: Merge "Update sample app to support right-to-left layouts" into lmp-mr1-dev
...
* commit 'e561c428e96657f6db95cb1c78d8a32365dfeb67':
Update sample app to support right-to-left layouts
2014-11-21 22:03:51 +00:00
Yigit Boyar
dcafbc3b0c
am 02c6b367: Merge "Remove deprecated API usage" into lmp-mr1-dev
...
* commit '02c6b3677c006ced9aa28bd2035fa6d797864983':
Remove deprecated API usage
2014-11-21 22:01:30 +00:00
Trevor Johns
9445329cd9
am 6276d0ac: am d9911fa7: am cdf2a929: am 82ea8a02: Add WatchFace sample to sdk.atree
...
* commit '6276d0ac33299e1f3c3d96865ec9c1c7abc9cb03':
Add WatchFace sample to sdk.atree
2014-11-21 21:57:21 +00:00
Kris Giesing
e561c428e9
am 16324f64: Merge "Update sample app to support right-to-left layouts" into lmp-mr1-dev
...
* commit '16324f64e543cad54a7ebe714ae894112eb14667':
Update sample app to support right-to-left layouts
2014-11-21 21:57:18 +00:00
Yigit Boyar
02c6b3677c
Merge "Remove deprecated API usage" into lmp-mr1-dev
2014-11-21 21:56:17 +00:00
Trevor Johns
6276d0ac33
am d9911fa7: am cdf2a929: am 82ea8a02: Add WatchFace sample to sdk.atree
...
* commit 'd9911fa7af9f185e39a9e2d8fb4882a65903d9e5':
Add WatchFace sample to sdk.atree
2014-11-21 21:53:01 +00:00
Kris Giesing
16324f64e5
Merge "Update sample app to support right-to-left layouts" into lmp-mr1-dev
2014-11-21 21:51:05 +00:00
Kris Giesing
445965e57d
Update sample app to support right-to-left layouts
...
Bug: 18262639
Change-Id: I2c1136821f665db095d72cee74f4c404badf4461
2014-11-21 10:30:11 -08:00
Trevor Johns
0b8cef119b
am 8ed64a23: am 0ae60761: am dc0c2a2a: am 30648384: am a35cfcea: Merge "Refresh prebuilts for SpeedTracker sample" into lmp-docs
...
* commit '8ed64a23ee2fee957b1b19340b56dfefbd8b2ffd':
Refresh prebuilts for SpeedTracker sample
2014-11-21 10:46:13 +00:00