Dirk Dougherty
f542a8b2fe
am 0628e3fe: am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit '0628e3fec9e75c960f8aed871afb26c021b1b2da':
Doc change: add video for edu page.
2013-06-21 11:11:11 -07:00
Dirk Dougherty
0628e3fec9
am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit 'c496c2a8889f1b676bb48c77c81bf8d3f39ed3a1':
Doc change: add video for edu page.
2013-06-21 11:07:44 -07:00
Scott Main
3aeba489b4
am fbba76fe: am 20eac772: am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
...
* commit 'fbba76fe21f937e935dcaebd677b22479d2e32a2':
add Arabic Google Play badges to generator bug: 7994508
2013-06-21 10:43:34 -07:00
Scott Main
fbba76fe21
am 20eac772: am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
...
* commit '20eac772f32e3b40959a8fb7c64565aad94b8054':
add Arabic Google Play badges to generator bug: 7994508
2013-06-21 10:38:37 -07:00
Wink Saville
d446dd7560
am 446792ba: Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
...
* commit '446792ba75459908d4f9ad322c08566a52e1f91e':
The config_show4GForLTe is dynamic use latest value.
2013-06-21 08:49:26 -07:00
Wink Saville
446792ba75
Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
2013-06-21 15:43:56 +00:00
Iliyan Malchev
e6345a1912
am 9233fc00: Revert "Revert "wifi: Get full scan results""
...
* commit '9233fc0023755e190e7c28374c5c6fa6558dec70':
Revert "Revert "wifi: Get full scan results""
2013-06-20 20:13:04 -07:00
Iliyan Malchev
9233fc0023
Revert "Revert "wifi: Get full scan results""
...
This reverts commit c2cbd4c11b .
Change-Id: Ia1cbde588ae9706966d6340c702fcfe1a82cfa79
2013-06-21 03:10:20 +00:00
Wink Saville
c06462c1ad
The config_show4GForLTe is dynamic use latest value.
...
Previously this was updated only at construction time,
but the value isn't even set at that time and can change
at anytime. So instead read the current value when needed.
Bug: 9513380
Change-Id: I50c676beadf5df8190897a9f6ab94c098e8d7e71
2013-06-20 18:15:20 -07:00
Dirk Dougherty
c496c2a888
am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit '68630bedefb36cb6789f573b065c13e441121611':
Doc change: add video for edu page.
2013-06-20 15:35:59 -07:00
Dirk Dougherty
68630bedef
am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit '8054c46e9bb87bb481195a6b823fd9d72623c80d':
Doc change: add video for edu page.
2013-06-20 15:33:47 -07:00
Dirk Dougherty
8054c46e9b
am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit 'e4bc7d812199a8d371da264575c74874877d4824':
Doc change: add video for edu page.
2013-06-20 15:31:48 -07:00
Dirk Dougherty
e4bc7d8121
am 6cb24e40: Doc change: add video for edu page.
...
* commit '6cb24e40ce6218dcd56ad22e13587d7f3d6e54b9':
Doc change: add video for edu page.
2013-06-20 15:29:27 -07:00
Dirk Dougherty
6cb24e40ce
Doc change: add video for edu page.
...
Change-Id: I81c539f0297de620ea0d0ded19d398329218f5df
2013-06-20 13:53:45 -07:00
kmccormick
fb45dbeb21
am 748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
...
* commit '748f6c854822c01ebf805202935037300d351104':
Doc change: New class on avoiding save conflicts
2013-06-19 16:41:07 -07:00
kmccormick
748f6c8548
Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
2013-06-19 23:38:34 +00:00
kmccormick
71baac1358
Doc change: New class on avoiding save conflicts
...
Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-19 15:02:58 -07:00
Wink Saville
7f08179407
am c80e3d43: TelephonyManager.listen can have notifyNow always true.
...
* commit 'c80e3d434f034d8594014df2fe028e9420930ea8':
TelephonyManager.listen can have notifyNow always true.
2013-06-19 13:19:02 -07:00
Wink Saville
c80e3d434f
TelephonyManager.listen can have notifyNow always true.
...
Since telepony.registry is a real system service notifyNow
parameter doesn't need to be conditional as telephony.registery
will never go away.
This is different from most of the other TelephonyManager
methods which are used to invoke methods on the phone service
which implements ITelephony and is implemented by
PhoneInterfaceManager in the phone application. Since the
phone app is not a system service it can and does go away when
it crashes.
Bug: 9393863
Change-Id: I1a8afc12b0e139e72f05820e49f3d996aec2b52a
2013-06-19 11:28:06 -07:00
Wink Saville
a5dc584650
am cc892d68: Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
...
* commit 'cc892d68c897f51b8998f7de11302bb9b9cebbff':
Change default for config_show4GForLte to true.
2013-06-19 10:11:49 -07:00
Wink Saville
cc892d68c8
Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
2013-06-19 17:09:28 +00:00
Stephen Hines
6e0e9b48d0
am 713c4bca: Update RenderScript doxygen reference manual.
...
* commit '713c4bca939b8cd6ae4915c4ccf464eed7a8b6a6':
Update RenderScript doxygen reference manual.
2013-06-19 09:35:06 -07:00
Stephen Hines
713c4bca93
Update RenderScript doxygen reference manual.
...
Change-Id: I0ba8f1c6c9b727b337708a3001964a7ee323483c
2013-06-19 08:54:42 -07:00
Iliyan Malchev
66acbc221b
am 0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev
...
* commit '0dff78aa32d8e7bc2eb057f2878a9e010417e42a':
Revert "wifi: Get full scan results"
2013-06-18 18:18:21 -07:00
Iliyan Malchev
0dff78aa32
Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev
2013-06-19 01:16:23 +00:00
Vineeta Srivastava
c2cbd4c11b
Revert "wifi: Get full scan results"
...
This reverts commit 67b3fbf49c .
Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713
Conflicts:
wifi/java/android/net/wifi/WifiNative.java
wifi/java/android/net/wifi/WifiStateMachine.java
2013-06-18 16:56:02 -07:00
Scott Main
20eac772f3
am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
...
* commit '334dadec751b2e51ff8a98498f02430b765aa091':
add Arabic Google Play badges to generator bug: 7994508
2013-06-18 15:31:37 -07:00
Scott Main
334dadec75
am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
...
* commit '033cfd7cc8c77fbf98c69010cfd95f09b836a61b':
add Arabic Google Play badges to generator bug: 7994508
2013-06-18 15:29:41 -07:00
Scott Main
033cfd7cc8
Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
2013-06-18 22:26:45 +00:00
Scott Main
c485361e9c
am 99700bfe: update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
...
* commit '99700bfee02dd99e47bca5f0ab4e841239deda04':
update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
2013-06-18 15:25:06 -07:00
Scott Main
763bca7bf5
add Arabic Google Play badges to generator
...
bug: 7994508
Change-Id: Ic9fa9e69ca3c8015f717455176aa7460a5ea5f16
2013-06-18 15:19:52 -07:00
Wink Saville
65a90d0709
Change default for config_show4GForLte to true.
...
Bug: 9265217
Change-Id: I962910de7826ce9825de2d2dfb9e50b84d0e7c75
2013-06-18 14:47:14 -07:00
Scott Main
99700bfee0
update supported media formats.
...
as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
Change-Id: If35f4bb35b8aabacb51dec79a00a0c353b8a5d3c
2013-06-18 10:49:06 -07:00
Scott Main
94ba190ebb
am de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
...
* commit 'de04dfb62dd43827c63c267003264966dd76c614':
some extra docs for TextDirectionHeuristic
2013-06-17 22:12:14 -07:00
Scott Main
de04dfb62d
Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
2013-06-18 05:10:32 +00:00
Scott Main
c8b4658a54
am 1a0a50e7: add collapsed list items for 4.1 TOC
...
* commit '1a0a50e7c23fb0ec5fe818a7069b890f22632691':
add collapsed list items for 4.1 TOC
2013-06-17 19:23:02 -07:00
Scott Main
1a0a50e7c2
add collapsed list items for 4.1 TOC
...
Change-Id: I241fb5415a3b893df7c8491c7a549f3d0d304e74
2013-06-17 19:19:38 -07:00
Scott Main
e442662330
some extra docs for TextDirectionHeuristic
...
Change-Id: I8ceac72a76a29bde0e25ed418110a6e4120654e3
2013-06-17 19:05:29 -07:00
Scott Main
c4473d10ed
am 27a8508e: add attributes reference for splimotionevents and layoutmode
...
* commit '27a8508ee1236ded652cd452b93884a9193654fc':
add attributes reference for splimotionevents and layoutmode
2013-06-17 18:36:09 -07:00
Scott Main
27a8508ee1
add attributes reference for splimotionevents and layoutmode
...
Change-Id: Id78f2957c994fc30a0837084f22766c8cfa70fe8
2013-06-18 01:33:33 +00:00
Scott Main
e4f975a321
am 7328de3d: am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
...
* commit '7328de3d02b8784b7562e1e0d2e749fdb854a095':
replace 'developers strick back' with 'this week in android' playlist
2013-06-17 17:59:29 -07:00
Scott Main
7328de3d02
am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
...
* commit '23f33bdab3da7ac3eb11d483eb038024ed4e3564':
replace 'developers strick back' with 'this week in android' playlist
2013-06-17 17:56:54 -07:00
Scott Main
23f33bdab3
am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
...
* commit '6b55515ed3c1e97b0dd932a482c375d0103f84cc':
replace 'developers strick back' with 'this week in android' playlist
2013-06-17 17:54:26 -07:00
Scott Main
6b55515ed3
am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
...
* commit '41b08da8198e76118ef7167058a88cb920f9fb74':
replace 'developers strick back' with 'this week in android' playlist
2013-06-17 17:53:06 -07:00
Xia Wang
8fcb169f79
am edc3bb66: Disable a flaky test case
...
* commit 'edc3bb661e9c8964d3926cbd7344793a32a2c2cd':
Disable a flaky test case
2013-06-17 17:48:47 -07:00
Scott Main
41b08da819
replace 'developers strick back' with 'this week in android' playlist
...
Change-Id: I0aa94f6332da8543d7a2eba80307a36c26d7654c
2013-06-17 17:47:36 -07:00
Xia Wang
edc3bb661e
Disable a flaky test case
...
Change-Id: I4ef780ed0c5394b67aa002baefc00e835018c4a0
2013-06-17 17:14:10 -07:00
Baligh Uddin
9e7926f28a
am 4a9e4226: (-s ours) Import translations. DO NOT MERGE
...
* commit '4a9e422680727cd1a8fd683bae98c62baa0710fd':
Import translations. DO NOT MERGE
2013-06-15 19:19:07 -07:00
Baligh Uddin
2f9807b8d7
Import translations. DO NOT MERGE
...
Change-Id: Ia0e22026f6b361ea67d393e154d719a46759ecea
Auto-generated-cl: translation import
2013-06-14 19:28:47 -07:00
Baligh Uddin
4a9e422680
Import translations. DO NOT MERGE
...
Change-Id: I45fbf411dc3f8cdb9a5ebd889ccf3a2868abb5a9
Auto-generated-cl: translation import
2013-06-14 19:27:44 -07:00