Scott Main
|
16560f1e14
|
resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp
Change-Id: Iaf15aa6c9087eb0e72661b40acbf74830df0b00c
|
2013-11-05 15:28:56 -08:00 |
|
Scott Main
|
fae59e8ae1
|
resolved conflicts for merge of 1d38e9a1 to klp-ub-dev
Change-Id: I4f74db2ae175c2405aacece146244928f436551c
|
2013-11-05 13:15:10 -08:00 |
|
Dirk Dougherty
|
d7f2d1ca07
|
resolved conflicts for merge of 2397b75d to klp-ub-dev
Change-Id: I1807a041af543acb7eb93105712d7f4af4d67521
|
2013-11-05 09:21:20 -08:00 |
|
Dirk Dougherty
|
43ce6bb39c
|
am 99acac3a: Add updated StorageProvider sample, merge _index with existing file.
* commit '99acac3adb85aecf7dc42ae9242adfa8c8c6dfc0':
Add updated StorageProvider sample, merge _index with existing file.
|
2013-11-04 21:53:22 -08:00 |
|
quddusc
|
4e4303c993
|
resolved conflicts for merge of 3943cdc9 to klp-ub-dev
|
2013-11-04 18:47:17 -08:00 |
|
quddusc
|
60737e9507
|
Merge commit '3943cdc9' into manualmerge2
Conflicts:
samples/browseable/ActivityInstrumentation/_index.jd
samples/browseable/TextLinkify/_index.jd
Change-Id: Ia9a333bd09d2e7e9417a560581c40bd02d295c12
|
2013-11-01 19:17:20 -07:00 |
|
Dirk Dougherty
|
99acac3adb
|
Add updated StorageProvider sample, merge _index with existing file.
Change-Id: I63d691929d2b30cedaafa5ede900670c59d4f83d
|
2013-11-01 15:10:11 -07:00 |
|
Scott Main
|
1d38e9a13e
|
Merge "Updated description for the StorageProvider browseable sample." into klp-docs
|
2013-10-31 21:10:47 +00:00 |
|
quddusc
|
177a5df995
|
Fixed broken link in ActivityInstrumentation sample description.
Change-Id: I1ab9a5750693f44dec7aa97c99a2cfcd6af0b78e
(cherry picked from commit b5de8afa23)
|
2013-10-31 20:01:25 +00:00 |
|
quddusc
|
9edda10707
|
Updated description for the StorageProvider browseable sample.
Change-Id: I3f83a89e3b154f207e4054b92f0d4fc1f7851eb4
(cherry picked from commit a76387f7a4)
|
2013-10-31 20:00:41 +00:00 |
|
quddusc
|
b5de8afa23
|
Fixed broken link in ActivityInstrumentation sample description.
Change-Id: I1ab9a5750693f44dec7aa97c99a2cfcd6af0b78e
|
2013-10-31 11:03:15 -07:00 |
|
Dirk Dougherty
|
2397b75dc4
|
Fix broken javadoc reference.
Change-Id: I6b39015c340894715b3b24980ca0241a5e8f2a5a
(cherry picked from commit cc1867bc5b)
|
2013-10-31 17:01:59 +00:00 |
|
Dirk Dougherty
|
3ef2b0f371
|
Add StorageProvider sample code to browseables.
Change-Id: I353f596e9fc7455781e4c8d7f1972dfcd5739ddb
(cherry picked from commit c921db8d27)
|
2013-10-31 16:59:07 +00:00 |
|
Dirk Dougherty
|
cc1867bc5b
|
Fix broken javadoc reference.
Change-Id: I6b39015c340894715b3b24980ca0241a5e8f2a5a
|
2013-10-31 05:45:54 -07:00 |
|
quddusc
|
11d2eef36f
|
Updated browsable sample descriptions.
Change-Id: I21e3dfacb4bc1acfbe3b17c5f8001ee758f9eec2
(cherry picked from commit 3943cdc962)
|
2013-10-31 11:55:15 +00:00 |
|
quddusc
|
3943cdc962
|
Updated browsable sample descriptions.
Change-Id: I21e3dfacb4bc1acfbe3b17c5f8001ee758f9eec2
|
2013-10-30 20:51:43 -07:00 |
|
quddusc
|
a76387f7a4
|
Updated description for the StorageProvider browseable sample.
Change-Id: I3f83a89e3b154f207e4054b92f0d4fc1f7851eb4
|
2013-10-30 20:37:34 -07:00 |
|
Dirk Dougherty
|
c921db8d27
|
Add StorageProvider sample code to browseables.
Change-Id: I353f596e9fc7455781e4c8d7f1972dfcd5739ddb
|
2013-10-30 19:31:29 -07:00 |
|
Dirk Dougherty
|
4b737b695e
|
Add prebuilt browseable samples as static files.
Change-Id: Ifb5382223343400882834d2dd9c182c3df602e34
|
2013-10-29 20:56:17 -07:00 |
|