Robert Ly
|
6755f930c0
|
am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
* commit '1a3e7cf259ef8eecdea236b3cba1608e1bd871e3':
cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
|
2011-06-14 17:46:07 -07:00 |
|
Robert Ly
|
9396bd944d
|
Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
|
2011-06-14 17:45:04 -07:00 |
|
Robert Ly
|
2039f17754
|
Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
|
2011-06-14 17:43:38 -07:00 |
|
Romain Guy
|
0e59cd3ab5
|
Merge "Add TextureView.getBitmap()"
|
2011-06-14 17:08:36 -07:00 |
|
Nick Pelly
|
fdb0927390
|
Merge "minor documentation fixes"
|
2011-06-14 17:06:54 -07:00 |
|
James Dong
|
2d6e1304b4
|
Merge "Enforce the rule that the timestamp from timelapse video source monotically increases"
|
2011-06-14 17:01:11 -07:00 |
|
James Dong
|
51d4cd1f39
|
Merge "Update MediaPlayer and MediaRecorder javadoc"
|
2011-06-14 17:00:49 -07:00 |
|
Robert Ly
|
38f30693ce
|
am 1dbb7075: am 8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
* commit '1dbb707592f0aff35e5ca1115f7ee278a5977c42':
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
|
2011-06-14 16:41:55 -07:00 |
|
Robert Ly
|
abcc8dd1d3
|
am 17cddaf2: am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
* commit '17cddaf2a64c8392a8e852283e720d3abdaca9b3':
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
|
2011-06-14 16:41:52 -07:00 |
|
Robert Ly
|
875ee08b5f
|
am b5c31b8a: am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
* commit 'b5c31b8a11d4f898b0f9aa6eaf7a89195d800409':
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
|
2011-06-14 16:41:49 -07:00 |
|
Robert Ly
|
f99d25729a
|
am 8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
* commit '8467cd7f90a23c345b41cfcdcc62f1f8e3716c37':
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
|
2011-06-14 16:38:08 -07:00 |
|
Robert Ly
|
78a1235615
|
am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
* commit '409b9a4cad1d2dad43e647fc63a4ab1f3435d437':
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
|
2011-06-14 16:38:05 -07:00 |
|
Robert Ly
|
947d3c64f5
|
am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
* commit '194f47451ce3a0d346e362dfd8753057f41c765d':
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
|
2011-06-14 16:38:02 -07:00 |
|
Robert Ly
|
739a085e09
|
Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
|
2011-06-14 16:36:17 -07:00 |
|
Robert Ly
|
4c190ffb02
|
Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
|
2011-06-14 16:35:22 -07:00 |
|
Robert Ly
|
02bae11c2e
|
Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
|
2011-06-14 16:35:12 -07:00 |
|
Fabrice Di Meglio
|
00d58c86b8
|
Merge "Add View.getResolvedLayoutDirection()"
|
2011-06-14 16:23:06 -07:00 |
|
Dianne Hackborn
|
9fa048bc02
|
resolved conflicts for merge of e95c07bd to master
Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6
|
2011-06-14 16:13:26 -07:00 |
|
Robert Ly
|
d32f8e9f58
|
resolved conflicts for merge of 398d021b to master
Change-Id: I4f8a2cfec95bf31c38365da0257e8d13897bb197
|
2011-06-14 15:50:38 -07:00 |
|
Amith Yamasani
|
39075d56b1
|
am eb5e633a: am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
* commit 'eb5e633a2488456874f829263fa6cb96588d25aa':
Stability fixes for PreferenceFragments.
|
2011-06-14 15:42:36 -07:00 |
|
Amith Yamasani
|
c23eb91771
|
am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
* commit '608a200d2ed19540bb356d54e96f72c8c6b089b1':
Stability fixes for PreferenceFragments.
|
2011-06-14 15:38:31 -07:00 |
|
Amith Yamasani
|
98bbfc6a14
|
Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
|
2011-06-14 15:35:13 -07:00 |
|
Gloria Wang
|
9bba85e903
|
Merge "To remove log spam in the Forward Lock DRM plugin. Fix for bug 4619159."
|
2011-06-14 15:35:11 -07:00 |
|
Robert Ly
|
aa5bfc9f7d
|
am 0b7d7f53: am b658dfb8: am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit '0b7d7f53a958132eb539fc81130423878c2db650':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
|
2011-06-14 15:25:00 -07:00 |
|
Robert Ly
|
47d3fcf20b
|
am ae6dc0c5: am cbfab050: am a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit 'ae6dc0c5e213ce5ca3c504020bc73993e1aceb9a':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
|
2011-06-14 15:22:51 -07:00 |
|
Robert Ly
|
de696b60b8
|
am ff46480e: am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit 'ff46480e748555a923242af4238ec8d4822fd2ae':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
|
2011-06-14 15:22:47 -07:00 |
|
Wink Saville
|
5d29daddb3
|
am 5d47d203: am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
* commit '5d47d203fb60f4e7c91d97fa852a23863861b011':
Enforce provision check for CSIM record only.
|
2011-06-14 15:22:42 -07:00 |
|
Wink Saville
|
85e1d15a5b
|
am aad3c3cb: am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE
* commit 'aad3c3cbb8d6ceebcf99b80b1567f310b3216d6a':
Make APN re-connect delay configuable
|
2011-06-14 15:22:38 -07:00 |
|
Wink Saville
|
b5993a7a67
|
am 46cd4a4b: am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
* commit '46cd4a4bfe432ed6b483c0d6fc1045e387f22710':
Revert "CDMALTE: Get roaming status based on SID/NID"
|
2011-06-14 15:22:33 -07:00 |
|
Dianne Hackborn
|
56b9fe28eb
|
am 7c7f8e18: am 0a8a2324: Merge "Fix issue #4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2
* commit '7c7f8e18dee8b582ec8e30a1412903ceec2ef5f5':
Fix issue #4603422: Compatibility mode button doesn't always update
|
2011-06-14 15:22:12 -07:00 |
|
Mathias Agopian
|
44a2d17ede
|
am 9ee39758: (-s ours) am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '9ee3975883cc4356d7b44f4e86d8c61589d2f42c':
DO NOT MERGE. may fix build on some version of gcc
|
2011-06-14 15:22:12 -07:00 |
|
Dianne Hackborn
|
2739ed32b6
|
am 8a73d211: am 74c48f2b: am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '8a73d211845671880b0d50fbb0c5caa065066c80':
Update resources documentation with new qualifiers.
|
2011-06-14 15:21:18 -07:00 |
|
Dianne Hackborn
|
bcb70efdce
|
am 0a8a2324: Merge "Fix issue #4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2
* commit '0a8a2324239d7604e2a68349585aa67b59b25f4c':
Fix issue #4603422: Compatibility mode button doesn't always update
|
2011-06-14 15:14:34 -07:00 |
|
Robert Ly
|
00e99bfa87
|
am 5d730c92: am 86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
* commit '5d730c9237fdf3252a9aa0c01c1653bae69f4f39':
cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
|
2011-06-14 15:13:21 -07:00 |
|
Dianne Hackborn
|
b085343ab5
|
Merge "Fix issue #4603422: Compatibility mode button doesn't always update" into honeycomb-mr2
|
2011-06-14 15:12:01 -07:00 |
|
Robert Ly
|
85e922e51d
|
am 86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
* commit '86ef7977a95d6e1783f646d96992582d1dbf080a':
cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
|
2011-06-14 15:10:07 -07:00 |
|
Robert Ly
|
0e5750378f
|
Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
|
2011-06-14 15:06:42 -07:00 |
|
Dianne Hackborn
|
b68aa6171b
|
Merge "resolved conflicts for merge of 77fc8b80 to master"
|
2011-06-14 15:05:46 -07:00 |
|
Robert Ly
|
04cbe09c47
|
am b658dfb8: am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit 'b658dfb8f4363643b9426649ffc8e48be5c332f6':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
|
2011-06-14 15:04:22 -07:00 |
|
Robert Ly
|
d168fb96c3
|
am cbfab050: am a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit 'cbfab050756555a2f7d707522a9d044bcaa4e0c8':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
|
2011-06-14 15:02:28 -07:00 |
|
Robert Ly
|
e6b686f497
|
am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '4cd4c82073a6066bb94cce089cd259d19969c0fd':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
|
2011-06-14 15:02:25 -07:00 |
|
Robert Ly
|
26571649c6
|
am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit 'cbd31aec9f4a7367d440bfb0c9683bd481461995':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
|
2011-06-14 15:01:48 -07:00 |
|
Robert Ly
|
28fe7d5707
|
Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
|
2011-06-14 14:58:32 -07:00 |
|
Robert Ly
|
a46983068e
|
am a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit 'a91d6552913c02538b3f97e774e9771cfbef9dec':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
|
2011-06-14 14:58:11 -07:00 |
|
Robert Ly
|
b3c02f97a8
|
am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '9fa54704492234aed15ccdb29aae9261674811e3':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
|
2011-06-14 14:58:08 -07:00 |
|
Robert Ly
|
14231eff1e
|
Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
|
2011-06-14 14:56:00 -07:00 |
|
Robert Ly
|
aefe60df4a
|
Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
|
2011-06-14 14:55:35 -07:00 |
|
Wink Saville
|
545478bf15
|
am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
* commit 'fbef26eb55cf8a5b5a25a2b748bf16b54d398abc':
Enforce provision check for CSIM record only.
|
2011-06-14 14:48:51 -07:00 |
|
Wink Saville
|
55a376e4ec
|
am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE
* commit 'c2d17d3bea02991df378237ea7058ccedb7c6a14':
Make APN re-connect delay configuable
|
2011-06-14 14:47:07 -07:00 |
|
Wink Saville
|
996dbd6469
|
am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
* commit '82c1a5dea305d56eb77efa7d9a730307ff6af28a':
Revert "CDMALTE: Get roaming status based on SID/NID"
|
2011-06-14 14:47:04 -07:00 |
|