OSDN Git Service
Daniel Sandler [Thu, 17 Nov 2011 15:52:17 +0000 (07:52 -0800)]
am
28b23cde: am
8b9ba6fa: am
f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit '
28b23cdef491a270d6fcd4d60f5aebef3f10f370':
Add a default Dreams component.
Daniel Sandler [Thu, 17 Nov 2011 15:52:15 +0000 (07:52 -0800)]
am
0505984a: am
e11bcd1d: am
5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1
* commit '
0505984abb503dbb64a521d7d1e27550f7a7b91b':
Remove day of week from phone notification panel.
Mathias Agopian [Thu, 17 Nov 2011 15:52:11 +0000 (07:52 -0800)]
am
905a12a9: am
abdade71: am
69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
* commit '
905a12a949e779b50ad7ab0d69047b6e047ad7b8':
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
Marco Nelissen [Thu, 17 Nov 2011 15:52:08 +0000 (07:52 -0800)]
am
5a1623b3: am
3de68918: am
e937da83: Merge "Change MediaController look b/
5584613" into ics-mr1
* commit '
5a1623b379662e95580736510e1640148c228123':
Change MediaController look b/
5584613
Daniel Sandler [Thu, 17 Nov 2011 15:48:15 +0000 (07:48 -0800)]
am
8b9ba6fa: am
f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit '
8b9ba6fa8806c401c89df88f0a1690fbfd1ebb89':
Add a default Dreams component.
Daniel Sandler [Thu, 17 Nov 2011 15:48:12 +0000 (07:48 -0800)]
am
e11bcd1d: am
5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1
* commit '
e11bcd1d72cb45af984b9d457c4306f51923e853':
Remove day of week from phone notification panel.
Mathias Agopian [Thu, 17 Nov 2011 15:48:10 +0000 (07:48 -0800)]
am
abdade71: am
69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
* commit '
abdade71bc17153696fe2abe281c5a3b0c2e5abe':
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
Marco Nelissen [Thu, 17 Nov 2011 15:48:01 +0000 (07:48 -0800)]
am
3de68918: am
e937da83: Merge "Change MediaController look b/
5584613" into ics-mr1
* commit '
3de689186531cebfabcb4b4d4163eae6baac528d':
Change MediaController look b/
5584613
Glenn Kasten [Thu, 17 Nov 2011 15:16:21 +0000 (07:16 -0800)]
am
7418e385: Merge "MidiFile uses C++ Thread not createThreadEtc"
* commit '
7418e385f4523b94662d3fef614dac26d8a36885':
MidiFile uses C++ Thread not createThreadEtc
Glenn Kasten [Thu, 17 Nov 2011 15:16:18 +0000 (07:16 -0800)]
am
b447e9ce: Merge "JetPlayer uses C++ Thread not createThreadEtc"
* commit '
b447e9ce1d3dc603a8879340f36a4ca4f22d6b62':
JetPlayer uses C++ Thread not createThreadEtc
Glenn Kasten [Thu, 17 Nov 2011 15:14:41 +0000 (07:14 -0800)]
Merge "MidiFile uses C++ Thread not createThreadEtc"
Glenn Kasten [Thu, 17 Nov 2011 15:14:29 +0000 (07:14 -0800)]
Merge "JetPlayer uses C++ Thread not createThreadEtc"
Dianne Hackborn [Thu, 17 Nov 2011 13:51:08 +0000 (05:51 -0800)]
am
77c5f4de: am
9aa6bd1c: am
717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming.
* commit '
77c5f4def49357a89abd9849b0bab950179d71f4':
Add new ManagedEGLContext class to help apps participate in memory trimming.
Dianne Hackborn [Thu, 17 Nov 2011 13:51:06 +0000 (05:51 -0800)]
am
7cd2b19a: am
65952ec4: am
4c6a65bc: Merge "Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '
7cd2b19a926224dee2b2e12f37c1d71ce658bf97':
Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in...
Robert Greenwalt [Thu, 17 Nov 2011 13:51:04 +0000 (05:51 -0800)]
am
89d94e35: am
795fcd07: am
33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1
* commit '
89d94e35509a03de47e3e29b92229a851fcee4d2':
Fix TelephonyManager to grab the best context
Jamie Gennis [Thu, 17 Nov 2011 13:51:02 +0000 (05:51 -0800)]
am
04dd4dea: am
7765fc65: am
fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
* commit '
04dd4deafdbde8e4a9d12745e3d4a886ef8769f4':
SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
Eric Fischer [Thu, 17 Nov 2011 13:51:00 +0000 (05:51 -0800)]
am
6c932dab: am
02ed923d: (-s ours) am
7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
6c932dab1cef4fc711c4fdab938bced67b15d5df':
Import revised translations. DO NOT MERGE
Gilles Debunne [Thu, 17 Nov 2011 13:50:57 +0000 (05:50 -0800)]
am
664d87ef: am
b3272d29: am
de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
* commit '
664d87ef01f7b4dbd7c96f23db73aba6cbc57481':
IME action (done, next...) correctly handled
Dianne Hackborn [Thu, 17 Nov 2011 13:46:34 +0000 (05:46 -0800)]
am
9aa6bd1c: am
717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming.
* commit '
9aa6bd1c34fe3583fe31f283a6415e84fec12567':
Add new ManagedEGLContext class to help apps participate in memory trimming.
Dianne Hackborn [Thu, 17 Nov 2011 13:46:32 +0000 (05:46 -0800)]
am
65952ec4: am
4c6a65bc: Merge "Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '
65952ec4dc0e1703eb87a54c252953c53d07affc':
Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in...
Robert Greenwalt [Thu, 17 Nov 2011 13:46:05 +0000 (05:46 -0800)]
am
795fcd07: am
33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1
* commit '
795fcd07943ac1aaab309a4fa0d6bad1b67671a8':
Fix TelephonyManager to grab the best context
Kristian Monsen [Thu, 17 Nov 2011 13:46:01 +0000 (05:46 -0800)]
Jamie Gennis [Thu, 17 Nov 2011 13:46:00 +0000 (05:46 -0800)]
am
7765fc65: am
fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
* commit '
7765fc651a9519dd2f0ac9d3374a50e9865c5c99':
SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
Eric Fischer [Thu, 17 Nov 2011 13:45:54 +0000 (05:45 -0800)]
am
02ed923d: (-s ours) am
7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
02ed923da995a10c537018861cfc149d04c66bc2':
Import revised translations. DO NOT MERGE
Gilles Debunne [Thu, 17 Nov 2011 13:45:29 +0000 (05:45 -0800)]
am
b3272d29: am
de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
* commit '
b3272d297bb45e5cd3201766baef4fef7921ce05':
IME action (done, next...) correctly handled
Kristian Monsen [Thu, 17 Nov 2011 13:43:40 +0000 (05:43 -0800)]
Merge "Fix fix for bug
2816327"
Alex Sakhartchouk [Thu, 17 Nov 2011 12:13:03 +0000 (04:13 -0800)]
am
e693fa3e: am
a962ef29: am
4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
* commit '
e693fa3e184f7a49f9bf912a0dac057fb339b8a4':
Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
Fred Chung [Thu, 17 Nov 2011 12:13:01 +0000 (04:13 -0800)]
am
d2789aa3: am
d592714d: am
15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '
d2789aa322357ebb453bcad8825a33b27bb78c29':
Bluetooth HDP sample.
The Android Open Source Project [Thu, 17 Nov 2011 12:12:57 +0000 (04:12 -0800)]
Alex Sakhartchouk [Thu, 17 Nov 2011 12:08:30 +0000 (04:08 -0800)]
am
a962ef29: am
4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
* commit '
a962ef2993099e6c5db3809a7e829e43c8cf084a':
Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
Fred Chung [Thu, 17 Nov 2011 12:08:28 +0000 (04:08 -0800)]
am
d592714d: am
15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '
d592714d9a48afce69d6904fc539f150b7c02898':
Bluetooth HDP sample.
The Android Open Source Project [Thu, 17 Nov 2011 12:08:27 +0000 (04:08 -0800)]
Steven Ross [Thu, 17 Nov 2011 01:49:02 +0000 (17:49 -0800)]
am
b076bfc5: Merge "Not showing facelock when plugging/unplugging fixes
5438524"
* commit '
b076bfc5e33ba9d234c874e3546b452d8410b668':
Not showing facelock when plugging/unplugging fixes
5438524
Steven Ross [Thu, 17 Nov 2011 01:46:44 +0000 (17:46 -0800)]
Merge "Not showing facelock when plugging/unplugging fixes
5438524"
Daniel Sandler [Thu, 17 Nov 2011 01:16:54 +0000 (17:16 -0800)]
am
f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit '
f52a4482dd3ca336f84fc6c533ea4a99a72b23dd':
Add a default Dreams component.
Daniel Sandler [Thu, 17 Nov 2011 01:14:30 +0000 (17:14 -0800)]
am
5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1
* commit '
5311917df5fe9804105ff6070346b8fac4b102df':
Remove day of week from phone notification panel.
Daniel Sandler [Thu, 17 Nov 2011 01:13:35 +0000 (17:13 -0800)]
Merge "Add a default Dreams component." into ics-mr1
Daniel Sandler [Thu, 17 Nov 2011 01:13:16 +0000 (17:13 -0800)]
Merge "Remove day of week from phone notification panel." into ics-mr1
Mathias Agopian [Thu, 17 Nov 2011 00:16:11 +0000 (16:16 -0800)]
am
69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
* commit '
69c17a11a2ce5badc238e66ce9f8ca4a3a1028b3':
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
Mathias Agopian [Thu, 17 Nov 2011 00:13:38 +0000 (16:13 -0800)]
Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
Mathias Agopian [Wed, 16 Nov 2011 23:59:13 +0000 (15:59 -0800)]
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
This reverts commit
e7758be6da85728df6b4215f413660c67c5a9740.
Seemed to cause failures un SurfaceTexture.
Bug:
5627450
Glenn Kasten [Wed, 16 Nov 2011 23:13:18 +0000 (15:13 -0800)]
am
3cce14e8: Merge "Bug
4903178 Restore priority and cgroup on stop"
* commit '
3cce14e8fff950f7e7c8b1649ad4ecbcdefedf6b':
Bug
4903178 Restore priority and cgroup on stop
Glenn Kasten [Wed, 16 Nov 2011 23:11:20 +0000 (15:11 -0800)]
Merge "Bug
4903178 Restore priority and cgroup on stop"
Marco Nelissen [Wed, 16 Nov 2011 22:57:23 +0000 (14:57 -0800)]
am
e937da83: Merge "Change MediaController look b/
5584613" into ics-mr1
* commit '
e937da83143d67fbd709d37bd7418f9807e72baa':
Change MediaController look b/
5584613
Marco Nelissen [Wed, 16 Nov 2011 22:54:20 +0000 (14:54 -0800)]
Merge "Change MediaController look b/
5584613" into ics-mr1
Dianne Hackborn [Wed, 16 Nov 2011 22:37:54 +0000 (14:37 -0800)]
am
717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming.
* commit '
717a25dc2a411edb548859cd6870363346c71b01':
Add new ManagedEGLContext class to help apps participate in memory trimming.
Dianne Hackborn [Wed, 16 Nov 2011 22:06:05 +0000 (14:06 -0800)]
am
4c6a65bc: Merge "Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '
4c6a65bc319feab120d40553d93b160908db2f6d':
Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in...
Dianne Hackborn [Wed, 16 Nov 2011 22:03:09 +0000 (14:03 -0800)]
Merge "Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
Fred Quintana [Wed, 16 Nov 2011 20:48:24 +0000 (12:48 -0800)]
am
9a8f2b10: Merge "When in the Choose Account flow if the accounts list display was initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display."
* commit '
9a8f2b1057ce9c9c639d23fbf710aba639db4f7a':
When in the Choose Account flow if the accounts list display was initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display.
Robert Greenwalt [Wed, 16 Nov 2011 20:46:23 +0000 (12:46 -0800)]
am
33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1
* commit '
33fe4a36b7d1ef84b13447f2a765db465ef96e56':
Fix TelephonyManager to grab the best context
Fred Quintana [Wed, 16 Nov 2011 20:45:14 +0000 (12:45 -0800)]
Merge "When in the Choose Account flow if the accounts list display was initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display."
Robert Greenwalt [Wed, 16 Nov 2011 20:06:53 +0000 (12:06 -0800)]
Merge "Fix TelephonyManager to grab the best context" into ics-mr1
Jamie Gennis [Wed, 16 Nov 2011 19:36:17 +0000 (11:36 -0800)]
am
fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
* commit '
fd6b64f6ad040b4d550a5219a2576997e2c0e85d':
SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
Jamie Gennis [Wed, 16 Nov 2011 19:34:30 +0000 (11:34 -0800)]
Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
Eric Fischer [Wed, 16 Nov 2011 19:02:20 +0000 (11:02 -0800)]
am
7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
7dc81e06e4d0554683595e8d2e318837548e249a':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Nov 2011 18:57:45 +0000 (10:57 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Alex Sakhartchouk [Wed, 16 Nov 2011 18:40:49 +0000 (10:40 -0800)]
am
5a471818: Merge "Expand RS vector3 types to vector4."
* commit '
5a4718183340a108b55eba7bf755b4432153caa1':
Expand RS vector3 types to vector4.
Gilles Debunne [Wed, 16 Nov 2011 18:37:23 +0000 (10:37 -0800)]
am
de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
* commit '
de8c5ec88982b836b2c50d4f685f4e05b29bdd0d':
IME action (done, next...) correctly handled
Alex Sakhartchouk [Wed, 16 Nov 2011 18:36:02 +0000 (10:36 -0800)]
Merge "Expand RS vector3 types to vector4."
Gilles Debunne [Wed, 16 Nov 2011 18:31:40 +0000 (10:31 -0800)]
Merge "IME action (done, next...) correctly handled" into ics-mr1
Alex Sakhartchouk [Wed, 16 Nov 2011 17:48:26 +0000 (09:48 -0800)]
am
4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
* commit '
4c593010dddc6d2972bab87b30bd1b11987a09e1':
Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
Fred Chung [Wed, 16 Nov 2011 17:48:20 +0000 (09:48 -0800)]
am
15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '
15fe377c7cb57c4d758edcfc1d1e53bcf5a0a8bc':
Bluetooth HDP sample.
The Android Open Source Project [Wed, 16 Nov 2011 17:48:16 +0000 (09:48 -0800)]
Alex Sakhartchouk [Wed, 16 Nov 2011 17:40:11 +0000 (09:40 -0800)]
Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
Fred Chung [Wed, 16 Nov 2011 17:31:54 +0000 (09:31 -0800)]
Merge "Bluetooth HDP sample." into ics-mr1
The Android Open Source Project [Wed, 16 Nov 2011 17:27:57 +0000 (09:27 -0800)]
No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
The Android Open Source Project [Wed, 16 Nov 2011 16:55:42 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
The Android Open Source Project [Wed, 16 Nov 2011 15:45:51 +0000 (07:45 -0800)]
am
5cf2a139: am
c172688d: (-s ours) am
c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
5cf2a1399e8cd047e84e159e25c74c259882f52c':
Fix bug in TextLayoutCacheKey handling embedded nulls.
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
The Android Open Source Project [Wed, 16 Nov 2011 15:42:14 +0000 (07:42 -0800)]
am
c172688d: (-s ours) am
c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
c172688d5e9a1d26e2792297939cbb7bd93acaf2':
Fix bug in TextLayoutCacheKey handling embedded nulls.
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
The Android Open Source Project [Wed, 16 Nov 2011 15:38:11 +0000 (07:38 -0800)]
am
c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
c7403258528a08ab74f7c29277d0c34ba6edc53d':
Fix bug in TextLayoutCacheKey handling embedded nulls.
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
The Android Open Source Project [Wed, 16 Nov 2011 15:33:58 +0000 (07:33 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
Steve Block [Wed, 16 Nov 2011 14:32:41 +0000 (06:32 -0800)]
am
862c2f52: Merge changes I2c304952,Ic04bbd69,Ibbac2268
* commit '
862c2f5275cb6e8baed5c53d3f2742740f8909a8':
Update Java Bridge test for coercing JavaScript String to Java char in an array
Add tests for multidimensional arrays in WebView's Java Bridge
Fix tests for methods returning arrays in WebView's Java Bridge
Steve Block [Wed, 16 Nov 2011 14:30:55 +0000 (06:30 -0800)]
Merge changes I2c304952,Ic04bbd69,Ibbac2268
* changes:
Update Java Bridge test for coercing JavaScript String to Java char in an array
Add tests for multidimensional arrays in WebView's Java Bridge
Fix tests for methods returning arrays in WebView's Java Bridge
Steve Block [Wed, 16 Nov 2011 14:26:59 +0000 (06:26 -0800)]
am
45047a11: Merge "Add tests for invalid and static methods in the WebView\'s Java Bridge"
* commit '
45047a11ae85361a40082ba41ee9b8fa19f3e039':
Add tests for invalid and static methods in the WebView's Java Bridge
Steve Block [Wed, 16 Nov 2011 14:24:14 +0000 (06:24 -0800)]
Merge "Add tests for invalid and static methods in the WebView's Java Bridge"
Jake Hamby [Wed, 16 Nov 2011 04:27:11 +0000 (20:27 -0800)]
am
ac62c901: am
0f2dec50: am
bd783684: am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
ac62c901b719157c49600fece23a1e29a75585e1':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:27:10 +0000 (20:27 -0800)]
am
566e594e: am
df1aba0a: am
c7b35481: am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
566e594e7e49fb7afb4eb0bb54cc896126c5e73e':
IAB Doc Fix: Error in code snippet Bug
5221766
Adrian Ludwig [Wed, 16 Nov 2011 04:27:08 +0000 (20:27 -0800)]
am
0ebffbc6: am
7456cf0a: am
cbc96549: am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
0ebffbc66d7099ea5a52faf060bb790572a4eec4':
Adding new "Security Best Practices" to the html docs.
Jake Hamby [Wed, 16 Nov 2011 04:24:45 +0000 (20:24 -0800)]
am
0f2dec50: am
bd783684: am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
0f2dec5033919fab77a2b52bb3cf33cf4975f2c9':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:24:42 +0000 (20:24 -0800)]
am
df1aba0a: am
c7b35481: am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
df1aba0a9d25a0f9d38593d369ba963dfcd45866':
IAB Doc Fix: Error in code snippet Bug
5221766
James Dong [Wed, 16 Nov 2011 04:24:38 +0000 (20:24 -0800)]
am
0e7d85fa: am
4e72e2bf: am
4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '
0e7d85fa93a5f5975b437277439b3c65f86cf275':
Document that release() should be called with onPause() and onStop() for media objects
Adrian Ludwig [Wed, 16 Nov 2011 04:24:38 +0000 (20:24 -0800)]
am
7456cf0a: am
cbc96549: am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
7456cf0a125b47860a43d9915bae69b5ef374703':
Adding new "Security Best Practices" to the html docs.
James Dong [Wed, 16 Nov 2011 04:19:55 +0000 (20:19 -0800)]
am
4e72e2bf: am
4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '
4e72e2bfc24afe053ca98c6de2591a4057cfd9fa':
Document that release() should be called with onPause() and onStop() for media objects
Jake Hamby [Wed, 16 Nov 2011 04:19:34 +0000 (20:19 -0800)]
am
bd783684: am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
bd7836846c1e5d3610ba6c26686674d429a4316c':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:19:33 +0000 (20:19 -0800)]
am
c7b35481: am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
c7b354810e9caebe1d4c79d8a2e756f3c194e68f':
IAB Doc Fix: Error in code snippet Bug
5221766
Adrian Ludwig [Wed, 16 Nov 2011 04:19:30 +0000 (20:19 -0800)]
am
cbc96549: am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
cbc96549c9c9a0a4f0bc8ccab1c044c71eba303b':
Adding new "Security Best Practices" to the html docs.
James Dong [Wed, 16 Nov 2011 04:16:47 +0000 (20:16 -0800)]
am
4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '
4fdc36e6d6003cdce911678f0b233697554f8dbf':
Document that release() should be called with onPause() and onStop() for media objects
Jake Hamby [Wed, 16 Nov 2011 04:16:12 +0000 (20:16 -0800)]
am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:16:02 +0000 (20:16 -0800)]
am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
IAB Doc Fix: Error in code snippet Bug
5221766
Adrian Ludwig [Wed, 16 Nov 2011 04:15:57 +0000 (20:15 -0800)]
am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
0fd69ff4b9311c6b5406b769d50c9aa22787b816':
Adding new "Security Best Practices" to the html docs.
James Dong [Wed, 16 Nov 2011 04:13:03 +0000 (20:13 -0800)]
Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
Adam Powell [Wed, 16 Nov 2011 03:58:04 +0000 (19:58 -0800)]
am
ca127baa: am
868933e0: am
45f05c95: Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
* commit '
ca127baa0675bc1168019fbb1f9812dbbe4613d7':
Fix bug
5623642 - Status bar background incompatible with some legacy apps
Adam Powell [Wed, 16 Nov 2011 03:56:09 +0000 (19:56 -0800)]
am
868933e0: am
45f05c95: Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
* commit '
868933e0e43faca442bc8d319898201b233cfb94':
Fix bug
5623642 - Status bar background incompatible with some legacy apps
Adam Powell [Wed, 16 Nov 2011 03:54:04 +0000 (19:54 -0800)]
am
45f05c95: Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
* commit '
45f05c9580739ffe2d665cec50efb0bb57d757ba':
Fix bug
5623642 - Status bar background incompatible with some legacy apps
Adam Powell [Wed, 16 Nov 2011 03:51:56 +0000 (19:51 -0800)]
Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
Jeff Brown [Wed, 16 Nov 2011 03:46:40 +0000 (19:46 -0800)]
am
221096fd: am
4c0e0dd2: am
3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1
* commit '
221096fdd6963a0f7090b928cfb92b9267f32d7a':
Eliminate hw.keyboards system properties.
Dianne Hackborn [Wed, 16 Nov 2011 03:46:38 +0000 (19:46 -0800)]
am
8e56e1f3: am
cbcf8259: am
cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1
* commit '
8e56e1f3459703a9b9f5a13676428eeda68bb73f':
Whoops, need to acquire lock.
Jeff Brown [Wed, 16 Nov 2011 03:43:35 +0000 (19:43 -0800)]
am
4c0e0dd2: am
3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1
* commit '
4c0e0dd29dcce33e7521b11d01d21d9431f3b264':
Eliminate hw.keyboards system properties.
Dianne Hackborn [Wed, 16 Nov 2011 03:43:32 +0000 (19:43 -0800)]
am
cbcf8259: am
cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1
* commit '
cbcf8259697d2cb9025657a88e01cbb84be11d70':
Whoops, need to acquire lock.
Jeff Brown [Wed, 16 Nov 2011 03:19:04 +0000 (19:19 -0800)]
am
3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1
* commit '
3e7497b4eccd3db1d6ff0ce1f1f2db11f9a8eeef':
Eliminate hw.keyboards system properties.