bohu
bdd5ac1dd5
am 36bff112: am 3ce7eb80: am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit '36bff11258d26f6e9046d8f3cfffa516e27769de':
Bump revision number for system images
2015-02-18 00:32:06 +00:00
bohu
36bff11258
am 3ce7eb80: am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit '3ce7eb80550ee884b3aa72a0165d888938fb5a6e':
Bump revision number for system images
2015-02-18 00:25:03 +00:00
bohu
3ce7eb8055
am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit 'db8737c81eecd336c9a3fb7a3947fd4bfc5654d4':
Bump revision number for system images
2015-02-17 18:46:53 +00:00
bohu
db8737c81e
am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit 'a706d1c0217936c6624dccee920049a4cf6f0582':
Bump revision number for system images
2015-02-17 18:40:03 +00:00
bohu
a706d1c021
am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit '21b908bac7f9cd8375062d986cbac899aabf217c':
Bump revision number for system images
2015-02-17 18:34:41 +00:00
bohu
e40c8f077d
am a02de1bd: Merge "Set revision number to 1 for system images" into lmp-mr1-dev
...
* commit 'a02de1bd4cfec8335b12eb2451128863add30bdc':
Set revision number to 1 for system images
2015-02-13 20:32:37 +00:00
bohu
21b908bac7
am 33bd8cb7: Bump revision number for system images
...
* commit '33bd8cb700b402769ecb6532ee684ea78b41c708':
Bump revision number for system images
2015-02-13 20:31:02 +00:00
bohu
a02de1bd4c
Merge "Set revision number to 1 for system images" into lmp-mr1-dev
2015-02-13 18:33:36 +00:00
bohu
33bd8cb700
Bump revision number for system images
...
Bump revision number for all system images by 1, since
we are going to publish newer system images that has
some gles fixes.
Change-Id: I1a79164a46bd09d41b5102699ec3ec5ae6961a83
2015-02-12 16:59:17 -08:00
bohu
3f7c83fc84
Set revision number to 1 for system images
...
Since it is going be the first release of api 22 system images,
set it to be 1.
Change-Id: Ida92f6045e4dca2e31108d6c2d5e4a7b251ba81b
2015-02-12 16:15:50 -08:00
Xavier Ducrohet
e1b86bacc7
am e0621935: (-s ours) am 47ebdd97: am 2c47fd48: Update build-tools version. DO NOT MERGE.
...
* commit 'e062193561b5dbc682a42a815026397623f54344':
Update build-tools version. DO NOT MERGE.
2015-02-05 22:02:20 +00:00
Xavier Ducrohet
e062193561
am 47ebdd97: am 2c47fd48: Update build-tools version. DO NOT MERGE.
...
* commit '47ebdd97527e7fdfca7c62b3569ae3a453afc2f4':
Update build-tools version. DO NOT MERGE.
2015-02-05 21:56:04 +00:00
Xavier Ducrohet
47ebdd9752
am 2c47fd48: Update build-tools version. DO NOT MERGE.
...
* commit '2c47fd4871cf8bc8b731d3a9baa66849452c9361':
Update build-tools version. DO NOT MERGE.
2015-02-05 21:49:17 +00:00
Xavier Ducrohet
2c47fd4871
Update build-tools version. DO NOT MERGE.
...
Change-Id: Ie67d2b1bdd739241e5f9b7c2ccf8dda5b06d17bc
2015-02-02 17:01:44 -08:00
Sam Hasinoff
02b19a182f
Stop living in the past.
...
find docs/copyright-templates -type f | xargs sed -i 's/2013/2015/g'
Change-Id: I2e3cc83a82e556f7833331ef3e2ed1012d16044e
2015-01-26 10:31:15 -08:00
Deepanshu Gupta
c69ff83feb
resolved conflicts for merge of 748fb34d to lmp-mr1-dev
...
Change-Id: I729cc4282ff2b65907fd8013de270bca514c6e83
2015-01-06 14:35:25 -08:00
Deepanshu Gupta
748fb34d04
am 8d10f2de: Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]
...
* commit '8d10f2debbe78961e4aaf1c44328750f30c7e48b':
Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]
2015-01-05 23:33:20 +00:00
Deepanshu Gupta
8d10f2debb
Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]
...
Added the do not merge tag so that it doesn't conflict with the version
number for the next API level.
Change-Id: Id9951894f845bdec2c6df9f923f9fbf67c9c2cfb
2014-12-31 00:20:56 +00:00
Deepanshu Gupta
fe3a0a924b
Reset SDK Platform Pkg revision for API 22
...
Reset the SDK Platform and LayoutLib revision numbers for the new API
level.
Change-Id: I03104600edbc7f365eeedc29a9c80602abe3a3aa
2014-12-30 16:18:51 -08:00
Lorenzo Colitti
8501840869
Add a button to the debug app to call reportBadNetwork.
...
Bug: 18777225
Change-Id: I964f3deb60ea509dfb647a01d2b7b357dd47209b
2014-12-17 14:22:11 +09:00
Trevor Johns
3666bde1a2
am 011c1614: am 65c18817: am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE)
...
* commit '011c16143323f1b6a5e3d0d3ac8659f48237b003':
Increment lmp-docs samples to revision 5 (DO NOT MERGE)
2014-12-16 03:42:46 +00:00
Trevor Johns
23e2194cf9
am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree
...
* commit '2f3095d93b5ef30d89ab3d939676f03918d76227':
Add new samples to sdk.atree
2014-12-16 03:41:50 +00:00
Trevor Johns
011c161433
am 65c18817: am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE)
...
* commit '65c1881776329fea22244908b9d41b5e78c664e9':
Increment lmp-docs samples to revision 5 (DO NOT MERGE)
2014-12-13 03:08:36 +00:00
Trevor Johns
65c1881776
am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE)
...
* commit '20d72ce3dbb2e22f0e83e433ead6af974750866d':
Increment lmp-docs samples to revision 5 (DO NOT MERGE)
2014-12-13 02:59:19 +00:00
Trevor Johns
20d72ce3db
Increment lmp-docs samples to revision 5 (DO NOT MERGE)
...
Change-Id: Iea7e17c19fea38dc0c57ec15839a07f5cb4d7193
2014-12-12 16:12:50 -08:00
Trevor Johns
2f3095d93b
am cee6440c: am babfe028: Add new samples to sdk.atree
...
* commit 'cee6440c2ae07d53d382b2972a228d7d6651d2f5':
Add new samples to sdk.atree
2014-12-12 21:38:58 +00:00
Trevor Johns
cee6440c2a
am babfe028: Add new samples to sdk.atree
...
* commit 'babfe02866d84a457381a7d4c895596c8ec75165':
Add new samples to sdk.atree
2014-12-12 21:32:14 +00:00
Dake Gu
0e5993dc2b
Merge "Add test case for multiple row horizontal grid view" into lmp-mr1-dev
2014-12-11 23:18:45 +00:00
Trevor Johns
babfe02866
Add new samples to sdk.atree
...
- PermissionRequest
- DirectorySelection
- AppUsageStatistics
- ScreenCapture
Change-Id: I78d70f47dab54bc40a0e4e320ce6f8799b2cc785
2014-12-11 15:12:05 -08:00
Dake Gu
d17b2e78e8
Add test case for multiple row horizontal grid view
...
Add test case for update dataset at last row with empty space.
b/18631342
b/18718926
Change-Id: I3c745a41b0486cf293fc6a5a595e50f0a14ee0d0
2014-12-11 14:59:12 -08:00
Trevor Johns
b3493a5535
am 2452c088: am 82365c20: am abededd8: Docs: Sync browseable samples for lmp-docs
...
* commit '2452c0880d904d9e042e290b75acbe6f49b5208f':
Docs: Sync browseable samples for lmp-docs
2014-12-10 03:52:56 +00:00
Trevor Johns
2452c0880d
am 82365c20: am abededd8: Docs: Sync browseable samples for lmp-docs
...
* commit '82365c20f22bbc07d4b195ac13ab468022bd6f0d':
Docs: Sync browseable samples for lmp-docs
2014-12-10 03:38:07 +00:00
Trevor Johns
82365c20f2
am abededd8: Docs: Sync browseable samples for lmp-docs
...
* commit 'abededd8f7014bb4af9e0e203b71633cd72e9c20':
Docs: Sync browseable samples for lmp-docs
2014-12-10 03:28:17 +00:00
Trevor Johns
abededd8f7
Docs: Sync browseable samples for lmp-docs
...
Synced to developers/samples/android commit
bc036ecdf44cd03163c206096172299f3940b057.
Change-Id: Ib68230d79ca300e7db906aff2ebfc2cb6c6968f7
2014-12-09 18:49:04 -08:00
Dake Gu
2dbbfbbffa
Merge "Add RowsFragment example" into lmp-mr1-dev
2014-12-09 23:19:34 +00:00
Dake Gu
72ae1d3818
Add RowsFragment example
...
Bug: 18622128
Change-Id: I12146a766fa383782f9917352c5959b6064835ee
2014-12-09 14:50:01 -08:00
Craig Stout
e2f3892fcb
Merge "Add 'Remove all then re-add'." into lmp-mr1-dev
2014-12-09 00:34:22 +00:00
Craig Stout
1b6ad39042
Add 'Remove all then re-add'.
...
Change-Id: I57f06fab207bcf47c1fd089bf720f539aa389e7e
2014-12-08 16:09:31 -08: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
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
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
d7e30037aa
Merge "Update for MediaSessionCompat support" into lmp-mr1-dev
2014-12-03 19:06:05 +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
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