Scott Main
f394e166a0
docs: update redirects for articles
...
Change-Id: Ia2db76f0b9cc07878ecdc1e673cd1ae376b0447f
2012-11-16 08:57:44 -08:00
Marco Nelissen
6cebef011f
Add gsm decoder to media codec list
...
b/6620569
Change-Id: I9c41bd34e931bb59405146931dfc12a00a423ef5
2012-11-16 07:42:30 -08:00
Scott Main
d0f76c870c
am 29808c07: am 763f9b7a: am e1e1a999: docs: add redirects for best practices pages that moved to training
...
* commit '29808c0797f8c4bcdd14cf5cda0cfde5f10adfc9':
docs: add redirects for best practices pages that moved to training
2012-11-15 18:30:13 -08:00
Scott Main
29808c0797
am 763f9b7a: am e1e1a999: docs: add redirects for best practices pages that moved to training
...
* commit '763f9b7aa82fd7a690b729d647e0238f6bf0330a':
docs: add redirects for best practices pages that moved to training
2012-11-15 18:27:44 -08:00
Scott Main
763f9b7aa8
am e1e1a999: docs: add redirects for best practices pages that moved to training
...
* commit 'e1e1a999e8c71604a0fa30adb1096d3645e8ba14':
docs: add redirects for best practices pages that moved to training
2012-11-15 18:25:55 -08:00
Scott Main
e1e1a999e8
docs: add redirects for best practices pages that moved to training
...
Change-Id: I0dd79fb863d50b0dd2f0f7d53babe345888f0f78
2012-11-15 17:47:44 -08:00
The Android Open Source Project
97013f483d
am 355cec04: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '355cec04df1440cc5b14c206bb1bdc97657a5bf5':
2012-11-14 12:42:51 -08:00
The Android Open Source Project
355cec04df
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I5f004fa3b810c03dbb419f13e5767ede992f509d
2012-11-14 12:40:51 -08:00
Scott Main
687bb9b854
am e2ea36c5: am 3206485f: am 95715d22: am 42801496: docs: a few bonus redirects for dac
...
* commit 'e2ea36c55fd5fb2b7dce128468cf1fbc191f70ea':
docs: a few bonus redirects for dac
2012-11-14 11:37:44 -08:00
Scott Main
e2ea36c55f
am 3206485f: am 95715d22: am 42801496: docs: a few bonus redirects for dac
...
* commit '3206485f9ea5156694467ba921d58d02bf6a07e9':
docs: a few bonus redirects for dac
2012-11-14 11:36:28 -08:00
Scott Main
3206485f9e
am 95715d22: am 42801496: docs: a few bonus redirects for dac
...
* commit '95715d2208766587c1fd0a3440beecba1ea5ef99':
docs: a few bonus redirects for dac
2012-11-14 11:34:14 -08:00
Scott Main
95715d2208
am 42801496: docs: a few bonus redirects for dac
...
* commit '42801496cff122e26abb34c09b79fa60135a02ea':
docs: a few bonus redirects for dac
2012-11-14 11:32:44 -08:00
The Android Automerger
2d7f1fafc2
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-14 11:27:52 -08:00
Scott Main
42801496cf
docs: a few bonus redirects for dac
...
Change-Id: I01743d0032ebe707125121e84d741d4d39ca5540
2012-11-14 09:59:12 -08:00
Scott Main
f5ff3bfc26
am 03c5eadb: am 55d6a11d: am cd18b809: am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '03c5eadb74f7f91a06fafb664e0ba7c7a2d29419':
docs: redirect next steps to building first app class
2012-11-12 20:01:02 -08:00
Scott Main
03c5eadb74
am 55d6a11d: am cd18b809: am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '55d6a11dd62be8296d1c5d943ca9a7fcb9e2cb2b':
docs: redirect next steps to building first app class
2012-11-12 19:58:09 -08:00
Scott Main
55d6a11dd6
am cd18b809: am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit 'cd18b80902d862211b4116e65d2473de1c1f0b44':
docs: redirect next steps to building first app class
2012-11-12 19:55:23 -08:00
Scott Main
cd18b80902
am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '2df7c91d5f93a91f23c54239de5ac49d06ee1554':
docs: redirect next steps to building first app class
2012-11-12 19:52:49 -08:00
Scott Main
2df7c91d5f
am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '87525f600943f36697c85c22555463bb199afc2f':
docs: redirect next steps to building first app class
2012-11-12 19:50:56 -08:00
Scott Main
87525f6009
am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '09d8f21c0b9531d1d2615a737b256da4f29d27bf':
docs: redirect next steps to building first app class
2012-11-12 19:47:51 -08:00
Scott Main
09d8f21c0b
am e242276c: docs: redirect next steps to building first app class
...
* commit 'e242276c5b021c6219b31e9a40e126b633f15deb':
docs: redirect next steps to building first app class
2012-11-12 19:45:49 -08:00
Andy Stadler
819950decd
am ee062480: am 623e45b7: am e9a06346: am 18bc76ab: Cleanup eclipse .classpath for Gallery2
...
* commit 'ee062480adcacde89e0ed1a04e8d0e34faa3e42c':
Cleanup eclipse .classpath for Gallery2
2012-11-12 16:15:54 -08:00
Andy Stadler
ee062480ad
am 623e45b7: am e9a06346: am 18bc76ab: Cleanup eclipse .classpath for Gallery2
...
* commit '623e45b7eec12cde5d77db2cdcbd276c5b245d2f':
Cleanup eclipse .classpath for Gallery2
2012-11-12 16:13:40 -08:00
Andy Stadler
623e45b7ee
am e9a06346: am 18bc76ab: Cleanup eclipse .classpath for Gallery2
...
* commit 'e9a0634689298458077de62186b6a85c4ff2324b':
Cleanup eclipse .classpath for Gallery2
2012-11-12 16:11:58 -08:00
Andy Stadler
e9a0634689
am 18bc76ab: Cleanup eclipse .classpath for Gallery2
...
* commit '18bc76ab25b105af2d26c5456e0937e139b3203b':
Cleanup eclipse .classpath for Gallery2
2012-11-12 16:09:36 -08:00
Andy Stadler
18bc76ab25
Cleanup eclipse .classpath for Gallery2
...
A couple of minor fixes to make eclipse happy.
Change-Id: Id9a30778efd3ef18e45efe316402971ca72a7c60
2012-11-12 14:40:23 -08:00
Andy Stadler
afa0c3fbbb
am a103fc1e: Cleanup eclipse .classpath for Gallery2
...
* commit 'a103fc1e4ed59001673ca28ddf0dabde9b2c0f01':
Cleanup eclipse .classpath for Gallery2
2012-11-12 13:50:28 -08:00
Andy Stadler
a103fc1e4e
Cleanup eclipse .classpath for Gallery2
...
A couple of minor fixes to make eclipse happy.
Change-Id: Id9a30778efd3ef18e45efe316402971ca72a7c60
2012-11-12 13:42:25 -08:00
Marco Nelissen
3cab67467e
Add video for VideoView demo
...
Add one of the CTS test videos so the demo works out of the box, and
make the video fill the screen instead of hardcoding it to a tiny size.
Change-Id: Ie26a4ae0e186fe966d0679b088492a0c7d035713
2012-11-09 14:46:52 -08:00
The Android Open Source Project
e761ab8fed
am 37ca54d2: (-s ours) am 62ea063d: am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge
...
* commit '37ca54d2a212cd4c1cb4ebf7d3a6cabb1748fe7b':
2012-11-08 06:31:49 -08:00
The Android Open Source Project
37ca54d2a2
am 62ea063d: am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge
...
* commit '62ea063df0c96ff549e1fe6d4bbdbf4836f23d3d':
2012-11-08 06:26:56 -08:00
Xavier Ducrohet
66eba00914
am 0a5b1596: am 42a111e5: am 9350dd44: am 85c1f088: revert API 17 system image to rev 1.
...
* commit '0a5b159698c94b718e6fd7395fb511b3476899d0':
revert API 17 system image to rev 1.
2012-11-08 06:17:41 -08:00
The Android Open Source Project
3d3c7ab815
am dcec4836: (-s ours) am 3902e196: am f2701a8a: Reconcile with jb-mr1-release - do not merge
...
* commit 'dcec4836a7e8153b172db27c10c49fa5d11e684c':
2012-11-08 06:17:40 -08:00
Xavier Ducrohet
0a5b159698
am 42a111e5: am 9350dd44: am 85c1f088: revert API 17 system image to rev 1.
...
* commit '42a111e579f2de6c834573285409a47d842c4057':
revert API 17 system image to rev 1.
2012-11-08 06:14:20 -08:00
The Android Open Source Project
dcec4836a7
am 3902e196: am f2701a8a: Reconcile with jb-mr1-release - do not merge
...
* commit '3902e1967eacb8211c2805eb4281c555bb0df8d8':
2012-11-08 06:12:38 -08:00
Scott Main
e242276c5b
docs: redirect next steps to building first app class
...
Change-Id: I2cc922573021a6c69d8830ab886b537df28a2a62
2012-11-07 17:47:47 -08:00
The Android Open Source Project
62ea063df0
am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge
...
* commit '7cb8e4ae66a4a9f73ed40576efd5da4d86e9a2a0':
2012-11-07 10:22:12 -08:00
The Android Open Source Project
7cb8e4ae66
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I36e5d6ccd61dc24a395656f7fdf9a6ca3781a331
2012-11-07 10:19:43 -08:00
Andrew Hsieh
6a172a167e
am a6326ef6: am e67bb3dc: am 0f85f2de: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
...
* commit 'a6326ef671e269863fda56f086388f9b76849e26':
Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:37:32 -08:00
Andrew Hsieh
a6326ef671
am e67bb3dc: am 0f85f2de: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
...
* commit 'e67bb3dc07975413341087727dd797b69fdd5dd2':
Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:27:15 -08:00
Andrew Hsieh
e67bb3dc07
am 0f85f2de: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
...
* commit '0f85f2de9c2ba9d764c7774fb826535ed9d148ca':
Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:24:52 -08:00
Andrew Hsieh
0f85f2de9c
Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
2012-11-06 20:16:34 -08:00
The Android Automerger
f893fe7ac1
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-06 18:03:53 -08:00
Xavier Ducrohet
42a111e579
am 9350dd44: am 85c1f088: revert API 17 system image to rev 1.
...
* commit '9350dd44e3516251d88661e298b80f9f9fc1d8e5':
revert API 17 system image to rev 1.
2012-11-06 17:13:23 -08:00
Xavier Ducrohet
9350dd44e3
am 85c1f088: revert API 17 system image to rev 1.
...
* commit '85c1f0880d5d8ac8fab41dc141eba3e5495bedcd':
revert API 17 system image to rev 1.
2012-11-06 17:09:19 -08:00
Xavier Ducrohet
85c1f0880d
revert API 17 system image to rev 1.
...
Change-Id: I6e28fd4567f8c99eaca86b328d10d616317cf5d8
2012-11-06 15:27:49 -08:00
Andrew Hsieh
18fc7183ea
Fix return type of glGetAttribLocation and glGetUniformLocation
...
from int to GLint.
See:
https://android-review.googlesource.com/#/c/46120
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml
Change-Id: I57fa430be2987b41e31fb6b3bcefa5dfb58e63b9
2012-11-06 13:52:56 -08:00
The Android Open Source Project
3902e1967e
am f2701a8a: Reconcile with jb-mr1-release - do not merge
...
* commit 'f2701a8a6e1b5a056e4c8609713ff9b045fc1e82':
2012-11-06 13:29:15 -08:00
The Android Open Source Project
f2701a8a6e
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I3cd40c84fd37293ca96b5c35bea6c34871bf7659
2012-11-06 13:26:41 -08:00
The Android Automerger
5b96c40589
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-06 13:13:21 -08:00
