Elliott Hughes
3cac46d17e
am 6bbc79f2: am f18eb323: am 767e1c01: am 9aac0c1b: Merge "fix potential memory leak"
...
* commit '6bbc79f26ee142daafe7d61973ed476f09307242':
fix potential memory leak
2013-01-03 18:54:50 -08:00
Elliott Hughes
6bbc79f26e
am f18eb323: am 767e1c01: am 9aac0c1b: Merge "fix potential memory leak"
...
* commit 'f18eb323c38cd4407b16dc8eda1cc860bb100850':
fix potential memory leak
2013-01-03 18:53:02 -08:00
Scott Main
2d47603de2
am 8a4e3fd2: am c41db6c9: am 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
...
* commit '8a4e3fd2ab1e6a5f17d104ca738d3e07262d85ac':
docs: fix broken links and add new sitemap text file
2013-01-03 18:50:08 -08:00
Elliott Hughes
f18eb323c3
am 767e1c01: am 9aac0c1b: Merge "fix potential memory leak"
...
* commit '767e1c010c0664fa4bf7e7e32b840af4bbe0b0cf':
fix potential memory leak
2013-01-03 18:50:03 -08:00
Elliott Hughes
767e1c010c
am 9aac0c1b: Merge "fix potential memory leak"
...
* commit '9aac0c1b35ec666a18f320be99e6aa37d0bcf202':
fix potential memory leak
2013-01-03 18:47:32 -08:00
Scott Main
8a4e3fd2ab
am c41db6c9: am 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
...
* commit 'c41db6c9ba298c8fac5068ad2843b4aa58ecf1c5':
docs: fix broken links and add new sitemap text file
2013-01-03 18:47:12 -08:00
Scott Main
c41db6c9ba
am 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
...
* commit '834b0f3cd90679655ac1549cb427fc9475ac4a4b':
docs: fix broken links and add new sitemap text file
2013-01-03 18:44:22 -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
Adam Powell
59e7da6905
am 4b816cc2: am 262b311c: am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected"
...
* commit '4b816cc269469008820f4fba3f031f9256636345':
Fix NullpointException problem in onMenuItemSelected
2013-01-03 17:46:02 -08:00
Adam Powell
4b816cc269
am 262b311c: am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected"
...
* commit '262b311c3c7d68204a72d3ba87bd76883aec00e2':
Fix NullpointException problem in onMenuItemSelected
2013-01-03 17:43:43 -08:00
Adam Powell
262b311c3c
am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected"
...
* commit 'b7de79d02743cc3b5372be27be818d3227a34e2b':
Fix NullpointException problem in onMenuItemSelected
2013-01-03 17:40:32 -08:00
Adam Powell
b7de79d027
am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected"
...
* commit '41bb82becea5dd1f995dbca5bf5a719f559102de':
Fix NullpointException problem in onMenuItemSelected
2013-01-03 17:37:49 -08:00
Elliott Hughes
9aac0c1b35
Merge "fix potential memory leak"
2013-01-03 17:35:57 -08:00
Sungmin Choi
bc268b9014
fix potential memory leak
...
use delete before return
Change-Id: I5449ad90bb6910f057bd825b722c9803a7343c34
2013-01-04 09:56:18 +09:00
Adam Powell
41bb82bece
Merge "Fix NullpointException problem in onMenuItemSelected"
2013-01-03 16:46:03 -08:00
Katie McCormick
ffcd5ea762
am 6d2b3fb3: am 0f7cc697: am f420b800: am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
...
* commit '6d2b3fb39751ba568dfdc103e3af654d80d8e265':
Doc change: minor fixes to support lib lesson.
2013-01-03 16:24:53 -08:00
Katie McCormick
6d2b3fb397
am 0f7cc697: am f420b800: am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
...
* commit '0f7cc697ed55f9b9587633c912b9bd9b8f41db31':
Doc change: minor fixes to support lib lesson.
2013-01-03 16:22:29 -08:00
Katie McCormick
0f7cc697ed
am f420b800: am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
...
* commit 'f420b800b8813aee636f955012da6fb87e631827':
Doc change: minor fixes to support lib lesson.
2013-01-03 16:20:07 -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
Jim Miller
04c209c175
am e15c9024: Merge "Remove unused keyguard code"
...
* commit 'e15c90241f1aeb0a4fdcfbd9480c84f3da500dbc':
Remove unused keyguard code
2013-01-03 15:52:02 -08:00
Jim Miller
e15c90241f
Merge "Remove unused keyguard code"
2013-01-03 15:49:22 -08:00
Christopher Tate
1b4cad6fc9
am a82fe9fa: Merge "Shrink Bundle.getString(key, default) and getCharSequence(key, default)"
...
* commit 'a82fe9faa18f7747f3d8f0238eb93f96f267d7cc':
Shrink Bundle.getString(key, default) and getCharSequence(key, default)
2013-01-03 15:44:02 -08:00
Christopher Tate
a82fe9faa1
Merge "Shrink Bundle.getString(key, default) and getCharSequence(key, default)"
2013-01-03 15:40:26 -08:00
Wink Saville
2c5b501286
am c48233c6: am c6e41cf2: am 28a7a059: am 881d5387: Merge "frameworks/base: Support for LTE network modes"
...
* commit 'c48233c60d8fdb93b62c19a7f77cb56242fe1f65':
frameworks/base: Support for LTE network modes
2013-01-03 15:24:08 -08:00
Wink Saville
c48233c60d
am c6e41cf2: am 28a7a059: am 881d5387: Merge "frameworks/base: Support for LTE network modes"
...
* commit 'c6e41cf2680773b02a7d8caacb6047ed31d6c260':
frameworks/base: Support for LTE network modes
2013-01-03 15:21:52 -08:00
Wink Saville
c6e41cf268
am 28a7a059: am 881d5387: Merge "frameworks/base: Support for LTE network modes"
...
* commit '28a7a05952b7c338f2c1746cb20a17e28358bffc':
frameworks/base: Support for LTE network modes
2013-01-03 15:19:14 -08:00
Wink Saville
28a7a05952
am 881d5387: Merge "frameworks/base: Support for LTE network modes"
...
* commit '881d5387a3e92fa30f5966f00a04c4a33af8f18b':
frameworks/base: Support for LTE network modes
2013-01-03 15:14:15 -08:00
Wink Saville
881d5387a3
Merge "frameworks/base: Support for LTE network modes"
2013-01-03 14:49:05 -08:00
Romain Guy
e0ece54bd9
am 59131481: Merge "Remove unnecessary & uninitialized variable Bug #7728929 "
...
* commit '5913148104f0b233d861fab2873befc865bf57c0':
Remove unnecessary & uninitialized variable Bug #7728929
2013-01-03 14:48:35 -08:00
Romain Guy
5913148104
Merge "Remove unnecessary & uninitialized variable Bug #7728929 "
2013-01-03 14:46:20 -08:00
Romain Guy
15a65bfee5
Remove unnecessary & uninitialized variable
...
Bug #7728929
The uninitialized variable was taken into account to compute
the hash of gradient cache entries, thus causing cache corruptions
and sometimes infinite loops (it would also cause the cache to fill
up.)
Change-Id: Ic807a9bf901888b121a6a781a81dafc33075ed2a
2013-01-03 14:45:39 -08:00
Romain Guy
65dcf5322f
am 44080524: Merge "Remove C++11 related warning"
...
* commit '44080524f083dc00704267a0919016388f0d5426':
Remove C++11 related warning
2013-01-03 13:13:40 -08:00
Romain Guy
44080524f0
Merge "Remove C++11 related warning"
2013-01-03 13:10:23 -08:00
Romain Guy
dcfc836b45
Remove C++11 related warning
...
Change-Id: I250ff7bd0ea49908e11b14c995d77312cd09a8b4
2013-01-03 13:08:57 -08:00
Christopher Tate
066b036cd6
am f947930e: Merge "Document ContentProvider\'s API a bit more explicitly"
...
* commit 'f947930ed2e7aa4b7cc9f2d9aad0b25ef002c0c7':
Document ContentProvider's API a bit more explicitly
2013-01-03 12:26:25 -08:00
Christopher Tate
f947930ed2
Merge "Document ContentProvider's API a bit more explicitly"
2013-01-03 12:22:53 -08:00
Christopher Tate
2bc6eb8c17
Document ContentProvider's API a bit more explicitly
...
In particular, call out parameters that must not be null.
Change-Id: I67af73163e36efefefa7df86499937f998be5b00
2013-01-03 12:16:54 -08:00
Scott Main
1355a436f8
am 0b8b0deb: am 36687030: am cd7b6a94: am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev
...
* commit '0b8b0deba92e9a877f921b9f1091c296cf67049a':
docs: dashboard update for 1/3/13
2013-01-03 12:00:07 -08:00
Scott Main
0b8b0deba9
am 36687030: am cd7b6a94: am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev
...
* commit '3668703021cc2f010d90d6194ca57456c9e11dbc':
docs: dashboard update for 1/3/13
2013-01-03 11:56:57 -08:00
Scott Main
3668703021
am cd7b6a94: am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev
...
* commit 'cd7b6a947060dfa3da58acbba039274103077757':
docs: dashboard update for 1/3/13
2013-01-03 11:54:51 -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
