OSDN Git Service
kmccormick [Fri, 21 Jun 2013 23:31:41 +0000 (16:31 -0700)]
am
75c59fb9: am
dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
* commit '
75c59fb9d9a1408146165300eae0899a965897bf':
Doc change: new Bluetooth LE doc
kmccormick [Fri, 21 Jun 2013 23:29:23 +0000 (16:29 -0700)]
am
dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
* commit '
dc22fa924a6df52fb6ad97aa63150c815a2f047f':
Doc change: new Bluetooth LE doc
kmccormick [Fri, 21 Jun 2013 23:00:18 +0000 (23:00 +0000)]
Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
kmccormick [Thu, 6 Jun 2013 18:14:57 +0000 (11:14 -0700)]
Doc change: new Bluetooth LE doc
Change-Id: Ib6d67497a9b4d54d13b4da8f1f9ee991bc5ef562
Wink Saville [Fri, 21 Jun 2013 19:15:54 +0000 (12:15 -0700)]
am
7334d25e: am
34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
* commit '
7334d25e79d733b419aacfd706aad762f823f2f9':
Fix misspelling of getLteSignalStrenght.
Wink Saville [Fri, 21 Jun 2013 19:12:24 +0000 (12:12 -0700)]
am
34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
* commit '
34fb4eae36bc926886149718672809a1ad43be97':
Fix misspelling of getLteSignalStrenght.
Wink Saville [Fri, 21 Jun 2013 19:06:54 +0000 (19:06 +0000)]
Merge "Fix misspelling of getLteSignalStrenght."
The Android Open Source Project [Fri, 21 Jun 2013 18:56:57 +0000 (11:56 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id59401f35b9a467ddcc56c2167d6c30bb6c3d3e9
The Android Automerger [Fri, 21 Jun 2013 18:35:45 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
kmccormick [Fri, 21 Jun 2013 18:24:00 +0000 (11:24 -0700)]
am
42449d48: am
da4a3f32: am
107e4830: am
3f4759a0: am
947857c1: am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
42449d4842af545e76591d5aee8ee715b0d1a485':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Dirk Dougherty [Fri, 21 Jun 2013 18:23:57 +0000 (11:23 -0700)]
am
f542a8b2: am
0628e3fe: am
c496c2a8: am
68630bed: am
8054c46e: am
e4bc7d81: am
6cb24e40: Doc change: add video for edu page.
* commit '
f542a8b2fecf74c5ae9eb2be08bcac36405e084a':
Doc change: add video for edu page.
kmccormick [Fri, 21 Jun 2013 18:18:47 +0000 (11:18 -0700)]
am
da4a3f32: am
107e4830: am
3f4759a0: am
947857c1: am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
da4a3f324b2944e3f088b67981ef30447a6fdeed':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
kmccormick [Fri, 21 Jun 2013 18:14:44 +0000 (11:14 -0700)]
am
107e4830: am
3f4759a0: am
947857c1: am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
107e48304516e810f0ecc20a540cce1bc25f252c':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Dirk Dougherty [Fri, 21 Jun 2013 18:11:11 +0000 (11:11 -0700)]
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.
Dirk Dougherty [Fri, 21 Jun 2013 18:07:44 +0000 (11:07 -0700)]
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.
kmccormick [Fri, 21 Jun 2013 18:05:26 +0000 (11:05 -0700)]
am
3f4759a0: am
947857c1: am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
3f4759a0268860511ff844c59968843e2985d3ef':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
kmccormick [Fri, 21 Jun 2013 17:59:18 +0000 (10:59 -0700)]
am
947857c1: am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
947857c11b9c50d97b9952bbbc29149680e7d4a3':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
kmccormick [Fri, 21 Jun 2013 17:57:38 +0000 (10:57 -0700)]
am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
cce880028ee694e296d2585b8932868b14f71223':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
kmccormick [Fri, 21 Jun 2013 17:56:13 +0000 (10:56 -0700)]
am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
9c309d3db95b1fc63925a18b81e6ceabcaa18407':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Scott Main [Fri, 21 Jun 2013 17:45:33 +0000 (10:45 -0700)]
am
3aeba489: 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 '
3aeba489b4df2522375356daf5358bf6938c5a96':
add Arabic Google Play badges to generator bug:
7994508
Scott Main [Fri, 21 Jun 2013 17:43:34 +0000 (10:43 -0700)]
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
Scott Main [Fri, 21 Jun 2013 17:38:37 +0000 (10:38 -0700)]
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
Wink Saville [Fri, 21 Jun 2013 16:58:11 +0000 (09:58 -0700)]
Fix misspelling of getLteSignalStrenght.
Change to getLteSignalStrength.
Change-Id: Ie2acec9e01af0e64a61902383f06729a7cee1975
Wink Saville [Fri, 21 Jun 2013 15:52:07 +0000 (08:52 -0700)]
am
d446dd75: am
446792ba: Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
* commit '
d446dd756081ec75693fc538e3460c9a2c758fe4':
The config_show4GForLTe is dynamic use latest value.
Wink Saville [Fri, 21 Jun 2013 15:49:26 +0000 (08:49 -0700)]
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.
Wink Saville [Fri, 21 Jun 2013 15:43:56 +0000 (15:43 +0000)]
Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
Iliyan Malchev [Fri, 21 Jun 2013 03:15:09 +0000 (20:15 -0700)]
am
e6345a19: am
9233fc00: Revert "Revert "wifi: Get full scan results""
* commit '
e6345a19129484572d3200edfff7f002a4314d0b':
Revert "Revert "wifi: Get full scan results""
Iliyan Malchev [Fri, 21 Jun 2013 03:13:04 +0000 (20:13 -0700)]
am
9233fc00: Revert "Revert "wifi: Get full scan results""
* commit '
9233fc0023755e190e7c28374c5c6fa6558dec70':
Revert "Revert "wifi: Get full scan results""
Iliyan Malchev [Fri, 21 Jun 2013 03:09:44 +0000 (03:09 +0000)]
Revert "Revert "wifi: Get full scan results""
This reverts commit
c2cbd4c11bfb83344502bd80389538795bae03cb.
Change-Id: Ia1cbde588ae9706966d6340c702fcfe1a82cfa79
Wink Saville [Fri, 21 Jun 2013 01:15:20 +0000 (18:15 -0700)]
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
The Android Open Source Project [Fri, 21 Jun 2013 00:31:59 +0000 (17:31 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I179642d15ce613dac101897cadf2c63ca60c5a11
kmccormick [Tue, 11 Jun 2013 20:17:55 +0000 (13:17 -0700)]
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Change-Id: I32fe3880852ed8bcbacec0bb5bf385b0022a791f
Dirk Dougherty [Thu, 20 Jun 2013 22:35:59 +0000 (15:35 -0700)]
am
68630bed: am
8054c46e: am
e4bc7d81: am
6cb24e40: Doc change: add video for edu page.
* commit '
68630bedefb36cb6789f573b065c13e441121611':
Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 22:33:47 +0000 (15:33 -0700)]
am
8054c46e: am
e4bc7d81: am
6cb24e40: Doc change: add video for edu page.
* commit '
8054c46e9bb87bb481195a6b823fd9d72623c80d':
Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 22:31:48 +0000 (15:31 -0700)]
am
e4bc7d81: am
6cb24e40: Doc change: add video for edu page.
* commit '
e4bc7d812199a8d371da264575c74874877d4824':
Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 22:29:27 +0000 (15:29 -0700)]
am
6cb24e40: Doc change: add video for edu page.
* commit '
6cb24e40ce6218dcd56ad22e13587d7f3d6e54b9':
Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 20:52:21 +0000 (13:52 -0700)]
Doc change: add video for edu page.
Change-Id: I81c539f0297de620ea0d0ded19d398329218f5df
Wink Saville [Wed, 19 Jun 2013 18:28:06 +0000 (11:28 -0700)]
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
Scott Main [Mon, 10 Jun 2013 21:30:35 +0000 (14:30 -0700)]
add ViewGroup's layoutMode attribute to public resources
bug:
9359960
Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
The Android Open Source Project [Thu, 20 Jun 2013 14:18:25 +0000 (07:18 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6ca669228f4605710cf3c67176f982d673f5c2cd
kmccormick [Wed, 19 Jun 2013 23:43:17 +0000 (16:43 -0700)]
am
fb45dbeb: am
748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
* commit '
fb45dbeb216f513905e3c2bb7a86da6558862f42':
Doc change: New class on avoiding save conflicts
kmccormick [Wed, 19 Jun 2013 23:41:07 +0000 (16:41 -0700)]
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
kmccormick [Wed, 19 Jun 2013 23:38:33 +0000 (23:38 +0000)]
Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
kmccormick [Tue, 11 Jun 2013 20:17:55 +0000 (13:17 -0700)]
Doc change: New class on avoiding save conflicts
Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Wink Saville [Wed, 19 Jun 2013 20:21:41 +0000 (13:21 -0700)]
am
7f081794: am
c80e3d43: TelephonyManager.listen can have notifyNow always true.
* commit '
7f081794074c1356ba347b802729adf36f06ad19':
TelephonyManager.listen can have notifyNow always true.
Wink Saville [Wed, 19 Jun 2013 20:19:02 +0000 (13:19 -0700)]
am
c80e3d43: TelephonyManager.listen can have notifyNow always true.
* commit '
c80e3d434f034d8594014df2fe028e9420930ea8':
TelephonyManager.listen can have notifyNow always true.
Wink Saville [Wed, 19 Jun 2013 18:28:06 +0000 (11:28 -0700)]
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
Wink Saville [Wed, 19 Jun 2013 17:14:25 +0000 (10:14 -0700)]
am
a5dc5846: am
cc892d68: Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
* commit '
a5dc5846502c13edd74ffd677d11e250b88ec17a':
Change default for config_show4GForLte to true.
Wink Saville [Wed, 19 Jun 2013 17:11:49 +0000 (10:11 -0700)]
am
cc892d68: Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
* commit '
cc892d68c897f51b8998f7de11302bb9b9cebbff':
Change default for config_show4GForLte to true.
Wink Saville [Wed, 19 Jun 2013 17:09:28 +0000 (17:09 +0000)]
Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
Stephen Hines [Wed, 19 Jun 2013 16:36:27 +0000 (09:36 -0700)]
am
6e0e9b48: am
713c4bca: Update RenderScript doxygen reference manual.
* commit '
6e0e9b48d0722ff96cfc69af1474572ee194da68':
Update RenderScript doxygen reference manual.
Stephen Hines [Wed, 19 Jun 2013 16:35:06 +0000 (09:35 -0700)]
am
713c4bca: Update RenderScript doxygen reference manual.
* commit '
713c4bca939b8cd6ae4915c4ccf464eed7a8b6a6':
Update RenderScript doxygen reference manual.
Stephen Hines [Wed, 19 Jun 2013 07:11:21 +0000 (00:11 -0700)]
Update RenderScript doxygen reference manual.
Change-Id: I0ba8f1c6c9b727b337708a3001964a7ee323483c
Vineeta Srivastava [Mon, 17 Jun 2013 20:24:47 +0000 (20:24 +0000)]
Revert "wifi: Get full scan results"
This reverts commit
67b3fbf49c0c92641e19e3278a1feab7b68aa7b8.
Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713
Conflicts:
wifi/java/android/net/wifi/WifiNative.java
wifi/java/android/net/wifi/WifiStateMachine.java
Scott Main [Mon, 10 Jun 2013 21:30:35 +0000 (14:30 -0700)]
add ViewGroup's layoutMode attribute to public resources
bug:
9359960
Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
Iliyan Malchev [Wed, 19 Jun 2013 01:20:41 +0000 (18:20 -0700)]
am
66acbc22: am
0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev
* commit '
66acbc221b750a645a1c9581f4a5bbe52e38729c':
Revert "wifi: Get full scan results"
Iliyan Malchev [Wed, 19 Jun 2013 01:18:21 +0000 (18:18 -0700)]
am
0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev
* commit '
0dff78aa32d8e7bc2eb057f2878a9e010417e42a':
Revert "wifi: Get full scan results"
Iliyan Malchev [Wed, 19 Jun 2013 01:16:23 +0000 (01:16 +0000)]
Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev
Vineeta Srivastava [Mon, 17 Jun 2013 20:24:47 +0000 (20:24 +0000)]
Revert "wifi: Get full scan results"
This reverts commit
67b3fbf49c0c92641e19e3278a1feab7b68aa7b8.
Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713
Conflicts:
wifi/java/android/net/wifi/WifiNative.java
wifi/java/android/net/wifi/WifiStateMachine.java
Scott Main [Tue, 18 Jun 2013 22:31:37 +0000 (15:31 -0700)]
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
Scott Main [Tue, 18 Jun 2013 22:29:41 +0000 (15:29 -0700)]
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
Scott Main [Tue, 18 Jun 2013 22:26:58 +0000 (15:26 -0700)]
am
c485361e: am
99700bfe: update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
* commit '
c485361e9cf5768174310e9e65ee5df4614eb601':
update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
Scott Main [Tue, 18 Jun 2013 22:26:45 +0000 (22:26 +0000)]
Merge "add Arabic Google Play badges to generator bug:
7994508" into jb-mr1.1-ub-dev
Scott Main [Tue, 18 Jun 2013 22:25:06 +0000 (15:25 -0700)]
am
99700bfe: update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
* commit '
99700bfee02dd99e47bca5f0ab4e841239deda04':
update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
Scott Main [Fri, 14 Jun 2013 17:58:51 +0000 (10:58 -0700)]
add Arabic Google Play badges to generator
bug:
7994508
Change-Id: Ic9fa9e69ca3c8015f717455176aa7460a5ea5f16
Wink Saville [Tue, 18 Jun 2013 21:47:14 +0000 (14:47 -0700)]
Change default for config_show4GForLte to true.
Bug:
9265217
Change-Id: I962910de7826ce9825de2d2dfb9e50b84d0e7c75
Scott Main [Tue, 18 Jun 2013 17:43:35 +0000 (10:43 -0700)]
update supported media formats.
as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
Change-Id: If35f4bb35b8aabacb51dec79a00a0c353b8a5d3c
Scott Main [Tue, 18 Jun 2013 05:13:17 +0000 (22:13 -0700)]
am
94ba190e: am
de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
* commit '
94ba190ebbd4fe7f8933d531cce7b4be8e04f287':
some extra docs for TextDirectionHeuristic
Scott Main [Tue, 18 Jun 2013 05:12:14 +0000 (22:12 -0700)]
am
de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
* commit '
de04dfb62dd43827c63c267003264966dd76c614':
some extra docs for TextDirectionHeuristic
Scott Main [Tue, 18 Jun 2013 05:10:32 +0000 (05:10 +0000)]
Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
Scott Main [Tue, 18 Jun 2013 02:25:00 +0000 (19:25 -0700)]
am
c8b4658a: am
1a0a50e7: add collapsed list items for 4.1 TOC
* commit '
c8b4658a5491cd6af322d47c96c00d0a77425f7f':
add collapsed list items for 4.1 TOC
Scott Main [Tue, 18 Jun 2013 02:23:02 +0000 (19:23 -0700)]
am
1a0a50e7: add collapsed list items for 4.1 TOC
* commit '
1a0a50e7c23fb0ec5fe818a7069b890f22632691':
add collapsed list items for 4.1 TOC
Scott Main [Tue, 18 Jun 2013 02:19:38 +0000 (19:19 -0700)]
add collapsed list items for 4.1 TOC
Change-Id: I241fb5415a3b893df7c8491c7a549f3d0d304e74
Scott Main [Thu, 23 May 2013 01:17:44 +0000 (18:17 -0700)]
some extra docs for TextDirectionHeuristic
Change-Id: I8ceac72a76a29bde0e25ed418110a6e4120654e3
Scott Main [Tue, 18 Jun 2013 01:39:18 +0000 (18:39 -0700)]
am
c4473d10: am
27a8508e: add attributes reference for splimotionevents and layoutmode
* commit '
c4473d10ed747fb1e84efff7183023e0ecc1a493':
add attributes reference for splimotionevents and layoutmode
Scott Main [Tue, 18 Jun 2013 01:36:09 +0000 (18:36 -0700)]
am
27a8508e: add attributes reference for splimotionevents and layoutmode
* commit '
27a8508ee1236ded652cd452b93884a9193654fc':
add attributes reference for splimotionevents and layoutmode
Scott Main [Mon, 10 Jun 2013 17:39:48 +0000 (10:39 -0700)]
add attributes reference for splimotionevents and layoutmode
Change-Id: Id78f2957c994fc30a0837084f22766c8cfa70fe8
Dianne Hackborn [Tue, 18 Jun 2013 01:28:58 +0000 (18:28 -0700)]
am
1d4cd879: am
11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."
* commit '
1d4cd879044578cf7e2b37d45ef29abaabf7e662':
Avoid unnecessary FindClass("java/lang/String").
Dianne Hackborn [Tue, 18 Jun 2013 01:21:41 +0000 (18:21 -0700)]
am
11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."
* commit '
11cd57caee4058dab743b91e715d7469c59a5c2f':
Avoid unnecessary FindClass("java/lang/String").
Dianne Hackborn [Tue, 18 Jun 2013 01:14:37 +0000 (01:14 +0000)]
Merge "Avoid unnecessary FindClass("java/lang/String")."
Scott Main [Tue, 18 Jun 2013 01:01:32 +0000 (18:01 -0700)]
am
e4f975a3: am
7328de3d: am
23f33bda: am
6b55515e: am
41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
* commit '
e4f975a3212d5cf4ba3a94d047674aebbc5285d1':
replace 'developers strick back' with 'this week in android' playlist
Scott Main [Tue, 18 Jun 2013 00:59:29 +0000 (17:59 -0700)]
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
Scott Main [Tue, 18 Jun 2013 00:56:54 +0000 (17:56 -0700)]
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
Scott Main [Tue, 18 Jun 2013 00:54:26 +0000 (17:54 -0700)]
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
Scott Main [Tue, 18 Jun 2013 00:53:06 +0000 (17:53 -0700)]
am
41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
* commit '
41b08da8198e76118ef7167058a88cb920f9fb74':
replace 'developers strick back' with 'this week in android' playlist
Xia Wang [Tue, 18 Jun 2013 00:51:57 +0000 (17:51 -0700)]
am
8fcb169f: am
edc3bb66: Disable a flaky test case
* commit '
8fcb169f7989123f993adfac5894d1ad5f35ed0b':
Disable a flaky test case
Xia Wang [Tue, 18 Jun 2013 00:48:47 +0000 (17:48 -0700)]
am
edc3bb66: Disable a flaky test case
* commit '
edc3bb661e9c8964d3926cbd7344793a32a2c2cd':
Disable a flaky test case
Scott Main [Tue, 18 Jun 2013 00:47:36 +0000 (17:47 -0700)]
replace 'developers strick back' with 'this week in android' playlist
Change-Id: I0aa94f6332da8543d7a2eba80307a36c26d7654c
Xia Wang [Mon, 17 Jun 2013 23:54:40 +0000 (16:54 -0700)]
Disable a flaky test case
Change-Id: I4ef780ed0c5394b67aa002baefc00e835018c4a0
Elliott Hughes [Mon, 17 Jun 2013 20:41:24 +0000 (13:41 -0700)]
am
48fa06f3: am
f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"
* commit '
48fa06f34fe3098fd820b97d9d28c9f27f8591de':
Correct Date format for el_GR, sv_SE and tr_TR locales
Elliott Hughes [Mon, 17 Jun 2013 20:38:59 +0000 (13:38 -0700)]
am
f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"
* commit '
f6a671394ca3d269835d5f5b882b46f9539e9a96':
Correct Date format for el_GR, sv_SE and tr_TR locales
Elliott Hughes [Mon, 17 Jun 2013 20:36:53 +0000 (20:36 +0000)]
Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"
howardb [Sun, 16 Jun 2013 13:16:53 +0000 (14:16 +0100)]
Correct Date format for el_GR, sv_SE and tr_TR locales
Amend DateFormat.getDateFormat to CLDR data from icu4c
instead of locale specific resource entries which are incorrect
for several locales.
No CTS tests are added as they require changing the locale which
is not currently possible.
Bug: https://code.google.com/p/android/issues/detail?id=56385
Change-Id: Ibd11c7fd9b595e19a3e2bf508e1585aa50067e03
Signed-off-by: howardb <android@howardb.com>
Vladimir Marko [Mon, 17 Jun 2013 11:46:22 +0000 (12:46 +0100)]
Avoid unnecessary FindClass("java/lang/String").
Use previously retrieved global reference instead.
Check for NULL after creating the global reference.
Change-Id: I21670d2ef0f63ddb5801dd21e7e56359e5519479
The Android Open Source Project [Sun, 16 Jun 2013 14:44:02 +0000 (07:44 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I425b496bc37821b3d9c10f92b5799dd6010b89db
The Android Automerger [Sun, 16 Jun 2013 12:55:34 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Baligh Uddin [Sun, 16 Jun 2013 02:23:44 +0000 (19:23 -0700)]
am
9e7926f2: am
4a9e4226: (-s ours) Import translations. DO NOT MERGE
* commit '
9e7926f28a353f55042247529372848267516f36':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 16 Jun 2013 02:20:22 +0000 (19:20 -0700)]
am
2f9807b8: Import translations. DO NOT MERGE
* commit '
2f9807b8d71fdc1a2336c22e89148325281b684e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 16 Jun 2013 02:19:07 +0000 (19:19 -0700)]
am
4a9e4226: (-s ours) Import translations. DO NOT MERGE
* commit '
4a9e422680727cd1a8fd683bae98c62baa0710fd':
Import translations. DO NOT MERGE
Daniel Sandler [Wed, 22 May 2013 18:24:20 +0000 (14:24 -0400)]
Temporarily restore some support for icon==0 notifications.
This is WRONG WRONG WRONG but certain apps rely on it to
poke the LED and so forth. In a future release this will
stop working.
Bug:
8623399
Change-Id: I49bb8ccc6891b1398ceec94c64d6c3a510ad1c38
OSDN Git Service
