Scott Main
3f8cdfdf37
am e3f73112: am 6bada134: am 9d1bdcb5: am 8a37395f: remove redirect for guide/index.html now that we actually have such a page
...
* commit 'e3f73112d0434fbc5e89853b1f1230b40006399b':
remove redirect for guide/index.html now that we actually have such a page
2014-01-18 02:28:58 +00:00
Scott Main
e3f73112d0
am 6bada134: am 9d1bdcb5: am 8a37395f: remove redirect for guide/index.html now that we actually have such a page
...
* commit '6bada1345201d1c42be2734b98ca631c9adbc3bd':
remove redirect for guide/index.html now that we actually have such a page
2014-01-18 02:26:51 +00:00
Scott Main
6bada13452
am 9d1bdcb5: am 8a37395f: remove redirect for guide/index.html now that we actually have such a page
...
* commit '9d1bdcb5f15ae5eb1e392ff564d7e55ea20e942b':
remove redirect for guide/index.html now that we actually have such a page
2014-01-17 18:23:15 -08:00
Scott Main
9d1bdcb5f1
am 8a37395f: remove redirect for guide/index.html now that we actually have such a page
...
* commit '8a37395f3a623cbd7d0c65de911c3d4e8d1002a2':
remove redirect for guide/index.html now that we actually have such a page
2014-01-18 02:21:27 +00:00
Alan Viverette
1c85b25ab1
am 802b3257: am b9dcf851: am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
...
* commit '802b3257de47f94b2a36da8d9ddd92cd89bade38':
Update DrawerLayout demo code to use title API
2014-01-17 22:41:51 +00:00
Alan Viverette
802b3257de
am b9dcf851: am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
...
* commit 'b9dcf8517443abc671c44cf3e629c623b7713bf1':
Update DrawerLayout demo code to use title API
2014-01-17 22:39:48 +00:00
Alan Viverette
b9dcf85174
am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
...
* commit 'f75b531f71a66daedd846f807a4008806bd37c21':
Update DrawerLayout demo code to use title API
2014-01-17 14:34:31 -08:00
Alan Viverette
f75b531f71
Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
2014-01-17 22:32:41 +00:00
Alan Viverette
13b90285ed
Update DrawerLayout demo code to use title API
...
BUG: 12460402
Change-Id: Id3873bf850f4fac67593c86be9aa2e9e1adb78ba
2014-01-17 10:54:15 -08:00
Alan Viverette
928962b775
am 057e870f: am c2c96e2e: am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
...
* commit '057e870f5133c2aef4b33dee7d4397ca0845dc62':
Revert "Update DrawerLayout demo code to use title API"
2014-01-17 06:00:26 +00:00
Alan Viverette
057e870f51
am c2c96e2e: am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
...
* commit 'c2c96e2e6237c83b2e7383a1d9553b8d004f8a33':
Revert "Update DrawerLayout demo code to use title API"
2014-01-17 05:58:13 +00:00
Alan Viverette
c2c96e2e62
am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
...
* commit 'ae03a0c38df9e669ecc45230830df64a5f30a139':
Revert "Update DrawerLayout demo code to use title API"
2014-01-16 20:28:02 -08:00
Alan Viverette
ae03a0c38d
Revert "Update DrawerLayout demo code to use title API"
...
Dependency isn't upstreaming properly, so reverting until it does.
This reverts commit eddc182fce .
Change-Id: Ic80e0a4b8f8289524828684bbcf836e210182ba9
2014-01-17 04:25:22 +00:00
Alan Viverette
3c44c2a2b4
am 69335b8f: am eae40e99: am eddc182f: Update DrawerLayout demo code to use title API
...
* commit '69335b8fe54e40dfa86447b87ab12983060cd14b':
Update DrawerLayout demo code to use title API
2014-01-17 01:06:43 +00:00
Alan Viverette
69335b8fe5
am eae40e99: am eddc182f: Update DrawerLayout demo code to use title API
...
* commit 'eae40e9945ef7b94c4e36834c0912eaba20fc3e3':
Update DrawerLayout demo code to use title API
2014-01-16 23:47:39 +00:00
Alan Viverette
eae40e9945
am eddc182f: Update DrawerLayout demo code to use title API
...
* commit 'eddc182fce572a688ad38295a6afccdfbf5335e8':
Update DrawerLayout demo code to use title API
2014-01-16 15:42:30 -08:00
Alan Viverette
eddc182fce
Update DrawerLayout demo code to use title API
...
BUG: 12460402
Change-Id: I3c740e571d487ae3edbb3607eaa335e92f3770ce
2014-01-16 14:53:19 -08:00
Andy Hung
17b6a3137e
Handle IOException from MediaCodec factory methods
...
Bug: 1136427
Change-Id: I411a341b551454ee3bd1215e3c6f5572d1555675
Signed-off-by: Andy Hung <hunga@google.com >
2014-01-16 14:02:05 -08:00
Yuhao Zheng
12f62196c5
Add opt/net/wifi/service to eclipse .classpath
...
bug: 12175455
Change-Id: I49df46a1b87822d6cae87b5ed716040e3b6803b7
2014-01-16 10:27:25 -08:00
Andrew Hsieh
a131dee497
am 0f69afed: am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit '0f69afedc212d49a4141a953302f1a165c1316c8':
Fix headers to be inclued alone
2014-01-16 17:17:30 +00:00
Andrew Hsieh
be13dbd7b8
am de53375f: am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit 'de53375f23faa38684ca6045067a2e797760f655':
Fix typo in comments in looper.h
2014-01-16 17:17:29 +00:00
Andrew Hsieh
470ec2be44
am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '0423f030642f78d0e107b3c43b75b0ff11fc2e3e':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:17:28 +00:00
Andrew Hsieh
0f69afedc2
am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit 'b14ac43dbd37c9519b339a99468b1d4a38ec2ce4':
Fix headers to be inclued alone
2014-01-16 17:14:39 +00:00
Andrew Hsieh
de53375f23
am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit 'f991c5478e8d82e1aa76c1c0a5f813cd5716e171':
Fix typo in comments in looper.h
2014-01-16 17:14:38 +00:00
Andrew Hsieh
0423f03064
am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '28c9c34d8670266add371e9f0f33e4da52a024f4':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:14:37 +00:00
Andrew Hsieh
b14ac43dbd
am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit 'ca34e29d94056bfc20b6b9ea8b36b41763acfe61':
Fix headers to be inclued alone
2014-01-16 09:09:58 -08:00
Andrew Hsieh
f991c5478e
am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit '42bb3bcadc1611efa2632e83eb5d094f60b82263':
Fix typo in comments in looper.h
2014-01-16 09:09:57 -08:00
Andrew Hsieh
28c9c34d86
am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '6d2d58de54169cd2cae9dbf3f69bd52af87daae5':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 09:09:56 -08:00
Andrew Hsieh
ca34e29d94
Merge "Fix headers to be inclued alone"
2014-01-16 17:03:03 +00:00
Andrew Hsieh
42bb3bcadc
Merge "Fix typo in comments in looper.h"
2014-01-16 17:02:47 +00:00
Andrew Hsieh
6d2d58de54
Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
2014-01-16 17:02:36 +00:00
Amith Yamasani
a7244cfc93
am 52cf96e9: Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
...
* commit '52cf96e9aa650ff50a0a25924e81bec35be56c4f':
Update eclipse classpath due to change in directory structure
2014-01-15 22:08:57 +00:00
Amith Yamasani
52cf96e9aa
Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
2014-01-15 22:06:55 +00:00
Andrew Hsieh
2c8776805a
Fix headers to be inclued alone
...
See b.android.com/64679 for one of header sys/prctl.h
Change-Id: Ie415ebe2086d2f0190d84fba0c57cc7e1e5822ae
2014-01-13 12:58:46 +08:00
Andrew Hsieh
bee62e6e92
am 926d852a: am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '926d852a5b838f0faa632839c31c4274e93cf200':
Implement wait4 already exist in header
2014-01-10 01:54:30 +00:00
Andrew Hsieh
926d852a5b
am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '1c9e736166ee6d00962360d1a41a840862346562':
Implement wait4 already exist in header
2014-01-10 00:41:31 +00:00
Andrew Hsieh
1c9e736166
am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '3517e742e3df5a61e622204dbb8d4110b5bad3ac':
Implement wait4 already exist in header
2014-01-09 16:36:48 -08:00
Andrew Hsieh
3517e742e3
Merge "Implement wait4 already exist in header"
2014-01-10 00:31:50 +00:00
Dirk Dougherty
026c467539
am 5969d205: am 5e90c148: Merge commit \'2397b75d\' into manualmerge
...
* commit '5969d205e6f6390e868ac7d6bbe4173242e051cf':
Fix broken javadoc reference.
2014-01-09 21:35:51 +00:00
Dirk Dougherty
da70c95553
am 35da2acf: am 9b903167: am 3ef2b0f3: Add StorageProvider sample code to browseables.
...
* commit '35da2acf9cf60bb35c502a42798153f9b511d0a4':
Add StorageProvider sample code to browseables.
2014-01-09 21:35:50 +00:00
quddusc
a585c22baf
am 0f2ebe84: am 60737e95: Merge commit \'3943cdc9\' into manualmerge2
...
* commit '0f2ebe84dab06b23100719383a051d2d36b0e6c0':
Updated browsable sample descriptions.
2014-01-09 21:35:49 +00:00
Elliott Hughes
9d0e2ca019
am 356cdcbd: am f99585bd: am ff11bce0: am 07bdc2b8: Merge "Fix build."
...
* commit '356cdcbd2771a82f8a927767532ba3b24152d333':
Fix build.
2014-01-09 21:35:47 +00:00
quddusc
c851feedfb
am 433830c0: am 213a31d7: am b5de8afa: Fixed broken link in ActivityInstrumentation sample description.
...
* commit '433830c039e501342062c8fa4868ffbaaf602c23':
Fixed broken link in ActivityInstrumentation sample description.
2014-01-09 21:35:46 +00:00
Dirk Dougherty
9425d82479
am d036ed77: am 6d63d11e: am cc1867bc: Fix broken javadoc reference.
...
* commit 'd036ed771d48819f711707d87757170ceaf77be7':
Fix broken javadoc reference.
2014-01-09 21:35:45 +00:00
quddusc
d444749e3b
am 727ff57f: am 0b448c3b: am 11d2eef3: Updated browsable sample descriptions.
...
* commit '727ff57f4abdeac6794fd16b79e0382bdff1d68b':
Updated browsable sample descriptions.
2014-01-09 21:35:44 +00:00
quddusc
3a71cc19ed
am d2b26f74: am a969fb4b: am a76387f7: Updated description for the StorageProvider browseable sample.
...
* commit 'd2b26f74de1b136b29bca0e2025a4d6583a5ef39':
Updated description for the StorageProvider browseable sample.
2014-01-09 21:35:43 +00:00
Dirk Dougherty
eb07ea9541
am 7f725ffd: am 7656c163: am 2a7b416b: Merge "Add StorageProvider sample code to browseables." into klp-dev
...
* commit '7f725ffdaeb17ad09fe6400f6648539b331d3f24':
Add StorageProvider sample code to browseables.
2014-01-09 21:35:42 +00:00
Svetoslav Ganov
87625caa5e
am d89fa640: am a12747bc: am 7c833d71: Merge "Update the print from off-screen WebView sample" into klp-dev
...
* commit 'd89fa640d0cd40f875ac2262520793dc362c5552':
Update the print from off-screen WebView sample
2014-01-09 21:35:41 +00:00
Adam Koch
de34fbabb3
am 4544562a: am 70f9c934: am ddba6b87: Merge "KitKat SMS APIs DevByte Sample Code" into klp-dev
...
* commit '4544562a93e020f81921f33b89e2f0748acb3f5c':
KitKat SMS APIs DevByte Sample Code
2014-01-09 21:35:40 +00:00
Svetoslav Ganov
218f323d8a
am f9c86a50: am c100e53e: am 79efac6b: Merge "Add print samples to the ApiDemos app." into klp-dev
...
* commit 'f9c86a50ff4bef01bb4f468efcb841565e0cc94f':
Add print samples to the ApiDemos app.
2014-01-09 21:35:38 +00:00