quddusc
ca789a9835
Merge "docs: Code sample for game controller training class." into jb-mr2-docs
2014-01-22 18:13:16 +00:00
Andy Hung
3d0ef8581a
Merge "Handle IOException from MediaCodec factory methods"
2014-01-21 23:06:38 +00:00
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
Andrew Hsieh
d980848377
Fix typo in comments in looper.h
...
Remove android-13's looper.h because it's identical to android-9's
Note that ndk/platforms/android-N only keep delta to previous level
Change-Id: Ibd2c3e168cfe7f6902fdc6eca2e2778d8ccf1fac
2014-01-08 17:24:22 +08:00
Andrew Hsieh
fbb32955a4
Fixed asset_manager.h, rect_manager.h, and jni.h
...
1. Fixed missing #include <sys/types.h> in android/asset_manager.h for API >= 13
2. Fixed missing #include <stdint.h> in android/rect_manager.h for API >= 14
3. Added JNICALL to JNI_OnLoad and JNI_OnUnload in jni.h
Change-Id: I875ec0b6e6f7c2f433c176f0a738eb78f3c33062
2014-01-08 14:10:06 +08:00
Deepanshu Gupta
bc0b4a804f
Bundle Noto fonts with the SDK
...
Change-Id: I28c48b3b5dbd761ef0391497e834f315ac83cae4
2014-01-08 01:44:45 +00:00
Xavier Ducrohet
054d78497e
resolved conflicts for merge of 7d85d0a9 to master
...
Change-Id: Ib04573eb46878537c5135d09dc62ee753377ec14
2014-01-07 13:21:20 -06:00
Xavier Ducrohet
39c7e520bc
am 699fdf70: am c7e44de1: am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
...
* commit '699fdf70319ed2f5842216c0ade4118b9f236f49':
Properly package the RS support bc file.
2014-01-07 19:07:32 +00:00
Xavier Ducrohet
7d85d0a99c
am d3795c4d: am 8c2f72eb: am 0a56aecd: Update build tools to 19.0.2
...
* commit 'd3795c4da6c0652c29e339cab24b28f27ac96f46':
Update build tools to 19.0.2
2014-01-07 18:12:47 +00:00
Xavier Ducrohet
699fdf7031
am c7e44de1: am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
...
* commit 'c7e44de1962a3c9e56645213d6b58bc08cf4597e':
Properly package the RS support bc file.
2014-01-07 18:12:46 +00:00
Xavier Ducrohet
d3795c4da6
am 8c2f72eb: am 0a56aecd: Update build tools to 19.0.2
...
* commit '8c2f72ebc8a34704da0f9dce5cf53cf7f8afeee2':
Update build tools to 19.0.2
2014-01-07 10:06:50 -08:00
Xavier Ducrohet
c7e44de196
am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
...
* commit 'cd171fd352aa8e6e1d1bc903038a81b7702f6d7a':
Properly package the RS support bc file.
2014-01-07 10:06:49 -08:00
Xavier Ducrohet
8c2f72ebc8
am 0a56aecd: Update build tools to 19.0.2
...
* commit '0a56aecdbbfb3e3e08a73c7411f41f5c7f0cabaa':
Update build tools to 19.0.2
2014-01-07 10:03:43 -08:00