Scott Main
4bc407e3e1
am 47e8d20d: move network usage sample zip
...
* commit '47e8d20d7b87be59ce38828659231afd425d05f8':
move network usage sample zip
2013-01-04 18:51:32 -08:00
Scott Main
47e8d20d7b
move network usage sample zip
...
Change-Id: I4ed2ebe357d420fea20d69515d9e91dc73579bba
2013-01-04 18:47:39 -08:00
Scott Main
ff9414235a
am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
...
* commit '181bb3aabc81f7e834e62874065c640dbc900f3e':
docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:23:58 -08:00
Scott Main
181bb3aabc
am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
...
* commit '921c8a5d86b08d331b757534a36ac519694ab2a2':
docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:20:57 -08:00
Scott Main
921c8a5d86
am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
...
* commit '4e483ed30697472aceb05bb1555f14b066ee8502':
docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:19:00 -08:00
Scott Main
4e483ed306
Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
2013-01-04 18:16:16 -08:00
Scott Main
f8daf19971
docs: misc bug fixes. including important versioning fixes for first app class
...
Change-Id: Ifda2509fc90dd795bfd6c5e9b3d7eebcbd77892a
2013-01-04 18:09:29 -08:00
Katie McCormick
dcab3ee658
am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
...
* commit '789716346ac21248efa37d3a7eadad854bbff350':
Doc update: fixed manifest typo in Network zip
2013-01-04 16:39:35 -08:00
Katie McCormick
789716346a
am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
...
* commit '928d2634ff9084ffc9d041b06fd7945cd8463801':
Doc update: fixed manifest typo in Network zip
2013-01-04 16:36:48 -08:00
Katie McCormick
928d2634ff
am 2b13a475: Doc update: fixed manifest typo in Network zip
...
* commit '2b13a475409aa28890c93088e86c065da1b07044':
Doc update: fixed manifest typo in Network zip
2013-01-04 16:34:19 -08:00
Katie McCormick
2b13a47540
Doc update: fixed manifest typo in Network zip
...
Change-Id: Iccf6dbce9d975337ab23b26dce63d3ec31303320
2013-01-04 16:17:45 -08:00
Scott Main
105a581b4f
am 75420403: am 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
...
* commit '754204037234c2dbef8306df0066cb4edbf2a41c':
docs: update sony driver link and name bug: 6566732
2013-01-04 11:38:52 -08:00
Scott Main
7542040372
am 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
...
* commit '7edf80747171d61bf8f22e00a8318b2da5ae9400':
docs: update sony driver link and name bug: 6566732
2013-01-04 11:36:41 -08:00
Scott Main
7edf807471
am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
...
* commit '197d0a6688ccf72632b461987671f1f2802935b7':
docs: update sony driver link and name bug: 6566732
2013-01-04 11:33:59 -08:00
Scott Main
197d0a6688
Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
2013-01-04 11:29:32 -08:00
Scott Main
9c6cec7b89
docs: update sony driver link and name
...
bug: 6566732
Change-Id: I8cb6e3295a24a7876d9cc9493889d85688357f79
2013-01-04 11:24:10 -08:00
Robert Ly
7ae9316428
am 29618824: am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
...
* commit '296188242d15c34229aaa2c5d87960dca7d1285a':
docs: update gms and gcm javadocs with new TOC
2013-01-04 11:09:07 -08:00
Robert Ly
296188242d
am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
...
* commit 'e478fb4fa74771863f8c98c04e93a1bd4f2f46ae':
docs: update gms and gcm javadocs with new TOC
2013-01-04 11:06:15 -08:00
Robert Ly
e478fb4fa7
am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
...
* commit '6b79e9542b2b2fae18a882696e61adb4fce144eb':
docs: update gms and gcm javadocs with new TOC
2013-01-04 11:03:04 -08:00
Robert Ly
6b79e9542b
Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
2013-01-04 10:58:55 -08:00
Robert Ly
d84d5ccdd4
docs: update gms and gcm javadocs with new TOC
...
Change-Id: Ic54c4e4e6e2b0008450abe9d3aa1ae53535d9160
2013-01-04 10:41:41 -08:00
Scott Main
834b0f3cd9
am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
...
* commit '19b17b419cb11c2ff064021ebdd0dda1daab4c35':
docs: fix broken links and add new sitemap text file
2013-01-03 18:42:05 -08:00
Scott Main
19b17b419c
am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
...
* commit '38a642e987612da86dc4f30b8d2c66a4a4833682':
docs: fix broken links and add new sitemap text file
2013-01-03 18:38:56 -08:00
Scott Main
38a642e987
am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
...
* commit '3e2479dd20ee9a1dab17e5dbec7fc835f2fa427f':
docs: fix broken links and add new sitemap text file
2013-01-03 18:36:45 -08:00
Scott Main
3e2479dd20
Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
2013-01-03 18:32:45 -08:00
Scott Main
188315cf8b
docs: fix broken links and add new sitemap text file
...
Change-Id: If0f7967a65a6e3a444a565a2e8229a04a5265f56
2013-01-03 18:02:21 -08:00
Katie McCormick
f420b800b8
am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
...
* commit '47f56dbf692939ba30a347844d6688e120a666ea':
Doc change: minor fixes to support lib lesson.
2013-01-03 16:16:47 -08:00
Katie McCormick
47f56dbf69
am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
...
* commit 'd56e4eca33639f175790d136d76f0d9cab9b95c3':
Doc change: minor fixes to support lib lesson.
2013-01-03 16:14:39 -08:00
Katie McCormick
d56e4eca33
am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
...
* commit 'ed2a05bc5b05e8aec0777ce2eb57bb91626524d8':
Doc change: minor fixes to support lib lesson.
2013-01-03 16:11:31 -08:00
Katie McCormick
ed2a05bc5b
Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
2013-01-03 16:07:45 -08:00
Katie McCormick
e06b0838e3
Doc change: minor fixes to support lib lesson.
...
Bug # 7633596
Change-Id: I380300b818cb6886c3c6857b64ba54e0602f7a37
2013-01-03 16:01:33 -08:00
Dake Gu
1ee60179bb
fix ImageView.getImageMatrix()
...
getImageMatrix() does not return "mDrawMatrix", instead it returns
mMatrix. This is not reflecting the matrix used in drawing when
Bitmap is changed and mDrawMatrix is set to null while mMatrix still
holds old invalid data.
Change-Id: If24c3118068eca70cfe15786f9715d95c4499f3b
2013-01-03 15:11:43 -08:00
Jason Noguchi
ca6a5eee8f
Refactoring the media recorder stress test.
...
Added test cases for:
- record & playback @ 1080p
- record & playback @ 720p
- record & playback @ 480p
- record & playback @ custom
Plus extending the record duration to a full minute.
Change-Id: I294714811606c1ae57907d6ef6a7052044b6247c
2013-01-03 12:27:48 -08:00
Scott Main
cd7b6a9470
am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev
...
* commit '7b31032051f430e03ac05503410b687fd289bdc3':
docs: dashboard update for 1/3/13
2013-01-03 11:51:27 -08:00
Scott Main
7b31032051
am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev
...
* commit '90c0548c057f0c26c4dcd215ee64e787460c4c6e':
docs: dashboard update for 1/3/13
2013-01-03 11:49:45 -08:00
Scott Main
90c0548c05
am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev
...
* commit '9fe82f1bc7c880bb1ec5ac3a9a1b5fff2c0bdda9':
docs: dashboard update for 1/3/13
2013-01-03 11:47:20 -08:00
Scott Main
9fe82f1bc7
Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev
2013-01-03 11:44:43 -08:00
Scott Main
b318318e0a
docs: dashboard update for 1/3/13
...
Change-Id: I0ff0b045d1c08a071fa706d8c0ff17943f2e752f
2013-01-03 11:39:34 -08:00
Xavier Ducrohet
e92b9706df
am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge.
...
* commit '816fd074cfc32fd3323163dd0c358e249f9cbf56':
Add single crunch command to aapt. do not merge.
2013-01-03 10:49:28 -08:00
Xavier Ducrohet
816fd074cf
am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge.
...
* commit 'afa4d8bfafdd42b75dc15d31c0962c252f304138':
Add single crunch command to aapt. do not merge.
2013-01-03 10:46:34 -08:00
Xavier Ducrohet
afa4d8bfaf
am 22d7cf23: Add single crunch command to aapt. do not merge.
...
* commit '22d7cf239d8a9b009ea7adf86d8826a8a8116d03':
Add single crunch command to aapt. do not merge.
2013-01-03 10:43:39 -08:00
Jason Noguchi
bac8666893
Adding camera scene mode stress test.
...
Change-Id: I3f9afef4edc6ea1f659263bf2dbd8ca247039ce0
2013-01-02 20:28:34 -08:00
Xavier Ducrohet
22d7cf239d
Add single crunch command to aapt. do not merge.
...
Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.
The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.
(cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac)
Change-Id: I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
2013-01-02 15:41:52 -08:00
Scott Main
96f0e00825
am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev
...
* commit '481102eed6d8eaff07489717bde7fc59a5dea5bf':
docs: add class on keyboards
2012-12-21 16:38:09 -08:00
Scott Main
8c8fd247a6
am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
...
* commit 'cee5267b766ce44ddf2faa1f32f2b79d49f088ac':
docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
2012-12-21 16:30:33 -08:00
Scott Main
481102eed6
am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev
...
* commit '0dae634b06f5dc6039a5aaa9c0f00250e10c6547':
docs: add class on keyboards
2012-12-21 16:29:16 -08:00
Scott Main
0dae634b06
Merge "docs: add class on keyboards" into jb-mr1-dev
2012-12-21 16:25:50 -08:00
Scott Main
cee5267b76
am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
...
* commit 'dc2c1a0f80042c42768fd868791e21412c3839b9':
docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
2012-12-21 16:25:36 -08:00
Scott Main
c8a6f8a041
docs: add class on keyboards
...
Change-Id: I3fb179457af50eec9d111f84eb9fabf49bc7ab1b
2012-12-21 16:24:36 -08:00
Scott Main
dc2c1a0f80
docs: add explanation of default permissions to Permission guide
...
and fix code snippet error in WebView guide.
external issue:41441
Change-Id: I5d021e4f04245385b62e992baebd702814fff930
2012-12-21 16:19:52 -08:00