Trevor Johns
659e1ca0c7
am 23e2194c: am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree
...
* commit '23e2194cf94b213aed40a3106071c8c90895d15c':
Add new samples to sdk.atree
2014-12-16 03:53:24 +00: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
5e8a678564
am 529288b5: am 0e5993dc: Merge "Add test case for multiple row horizontal grid view" into lmp-mr1-dev
...
* commit '529288b59c9019e117a1f8a68659d2ef9c88a1f5':
Add test case for multiple row horizontal grid view
2014-12-12 14:41:35 +00:00
Dake Gu
529288b59c
am 0e5993dc: Merge "Add test case for multiple row horizontal grid view" into lmp-mr1-dev
...
* commit '0e5993dc2b566ae66961f898f64aedf226c930ec':
Add test case for multiple row horizontal grid view
2014-12-11 23:27:15 +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
641bc913e3
am f95ac6f0: am b3493a55: am 2452c088: am 82365c20: am abededd8: Docs: Sync browseable samples for lmp-docs
...
* commit 'f95ac6f06d9f9f5c84d331f62c3b8a18b55458b8':
Docs: Sync browseable samples for lmp-docs
2014-12-10 22:20:28 +00:00
Trevor Johns
f95ac6f06d
am b3493a55: am 2452c088: am 82365c20: am abededd8: Docs: Sync browseable samples for lmp-docs
...
* commit 'b3493a5535aab3af9a5f51ee837018f8a94fc087':
Docs: Sync browseable samples for lmp-docs
2014-12-10 03:58:50 +00: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
Dake Gu
f96ced6771
am 3cc97974: am 2dbbfbbf: Merge "Add RowsFragment example" into lmp-mr1-dev
...
* commit '3cc979745c86d9b32dc96d04ffbb5f233fa45155':
Add RowsFragment example
2014-12-10 03:32:43 +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
3cc979745c
am 2dbbfbbf: Merge "Add RowsFragment example" into lmp-mr1-dev
...
* commit '2dbbfbbffaeb343f6d25021b8d9148ca48cd5f5a':
Add RowsFragment example
2014-12-09 23:27:27 +00: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
Andrew Hsieh
1e75455637
am e5ede93a: Merge "Header/symbol for unknown arch."
...
* commit 'e5ede93a47885b9ac9d0ccb72c0ef4ad0d655547':
Header/symbol for unknown arch.
2014-12-09 15:03:22 +00:00
Andrew Hsieh
e5ede93a47
Merge "Header/symbol for unknown arch."
2014-12-09 02:50:43 +00:00
WenHan Gu
d7120d4451
Header/symbol for unknown arch.
...
Change-Id: Ibdbc4cf5408958444ed7a83da6c8bbe478072c6d
2014-12-09 10:50:05 +08:00
Craig Stout
9411b61877
am 153dc4d3: am e2f3892f: Merge "Add \'Remove all then re-add\'." into lmp-mr1-dev
...
* commit '153dc4d3b7021d63c8595efa5bcc06519498b319':
Add 'Remove all then re-add'.
2014-12-09 00:49:19 +00:00
Craig Stout
153dc4d3b7
am e2f3892f: Merge "Add \'Remove all then re-add\'." into lmp-mr1-dev
...
* commit 'e2f3892fcbf59c54deb38287b20b4083a3f324ca':
Add 'Remove all then re-add'.
2014-12-09 00:42:28 +00: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
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