OSDN Git Service
The Android Open Source Project [Thu, 17 Nov 2011 12:08:27 +0000 (04:08 -0800)]
Steven Ross [Thu, 17 Nov 2011 01:46:44 +0000 (17:46 -0800)]
Merge "Not showing facelock when plugging/unplugging fixes
5438524"
Glenn Kasten [Wed, 16 Nov 2011 23:11:20 +0000 (15:11 -0800)]
Merge "Bug
4903178 Restore priority and cgroup on stop"
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."
Alex Sakhartchouk [Wed, 16 Nov 2011 18:36:02 +0000 (10:36 -0800)]
Merge "Expand RS vector3 types to vector4."
The Android Open Source Project [Wed, 16 Nov 2011 17:48:16 +0000 (09:48 -0800)]
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: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: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: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: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
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: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: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.
Jeff Brown [Wed, 16 Nov 2011 03:17:09 +0000 (19:17 -0800)]
Merge "Eliminate hw.keyboards system properties." into ics-mr1
The Android Automerger [Wed, 16 Nov 2011 03:08:44 +0000 (19:08 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Dianne Hackborn [Wed, 16 Nov 2011 03:06:20 +0000 (19:06 -0800)]
am
cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1
* commit '
cdec187a27b2acc34cd4df26b836b83362527d6a':
Whoops, need to acquire lock.
Dianne Hackborn [Wed, 16 Nov 2011 03:04:11 +0000 (19:04 -0800)]
Merge "Whoops, need to acquire lock." into ics-mr1
Jean-Michel Trivi [Wed, 16 Nov 2011 02:28:39 +0000 (18:28 -0800)]
am
4978c1a5: am
0ddb0143: Merge "Fix
5623252 unlink to death of audio focus client early" into ics-mr1
* commit '
4978c1a5b07782d622ca9e3eedd649a5927d226f':
Fix
5623252 unlink to death of audio focus client early
Mathias Agopian [Wed, 16 Nov 2011 02:25:30 +0000 (18:25 -0800)]
am
bc1b7f04: am
c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1
* commit '
bc1b7f0481f9bfa0e9feff0b43e48f9f171e0c38':
rework a bit how we manage EGL extensions
Jim Miller [Wed, 16 Nov 2011 02:25:12 +0000 (18:25 -0800)]
am
58c6f1b2: am
c57bfa4a: Fix
5581164: Add abbreviated localized date strings
* commit '
58c6f1b2e1528cd14bef94ae9c5b922b7751309c':
Fix
5581164: Add abbreviated localized date strings
Jim Miller [Wed, 16 Nov 2011 02:25:08 +0000 (18:25 -0800)]
am
8622fb34: am
34a62348: Merge "Fix
5581164: Use abbreviated day in lockscreen" into ics-mr1
* commit '
8622fb34769dc257a319ce8e7dab652312d6c049':
Fix
5581164: Use abbreviated day in lockscreen
Jean-Michel Trivi [Wed, 16 Nov 2011 02:21:44 +0000 (18:21 -0800)]
am
0ddb0143: Merge "Fix
5623252 unlink to death of audio focus client early" into ics-mr1
* commit '
0ddb0143895b816d4ff5c174b346390e07f26556':
Fix
5623252 unlink to death of audio focus client early
Jean-Michel Trivi [Wed, 16 Nov 2011 02:19:34 +0000 (18:19 -0800)]
Merge "Fix
5623252 unlink to death of audio focus client early" into ics-mr1
Mathias Agopian [Wed, 16 Nov 2011 02:15:18 +0000 (18:15 -0800)]
am
c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1
* commit '
c0fa2a3bce40d52c0f1cccd87f8b0816a6faa6a7':
rework a bit how we manage EGL extensions
Mathias Agopian [Wed, 16 Nov 2011 02:12:00 +0000 (18:12 -0800)]
Merge "rework a bit how we manage EGL extensions" into ics-mr1
Jeff Brown [Wed, 16 Nov 2011 01:48:10 +0000 (17:48 -0800)]
Eliminate hw.keyboards system properties.
Stop using system properties to publish information about
the key character map path. Instead, we can retrieve it
on demand by asking the window manager.
It was possible to exhaust the supply of system properties
when repeatedly adding and removing input devices.
Bug:
5532806
Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
Steven Ross [Wed, 16 Nov 2011 01:18:39 +0000 (17:18 -0800)]
Merge "No blackscreen when dialog is showing fixes
5511992"
Jim Miller [Wed, 16 Nov 2011 00:18:32 +0000 (16:18 -0800)]
am
c57bfa4a: Fix
5581164: Add abbreviated localized date strings
* commit '
c57bfa4a4bf4c810b5c663df17443463d8192e8f':
Fix
5581164: Add abbreviated localized date strings
Jim Miller [Tue, 15 Nov 2011 23:44:17 +0000 (15:44 -0800)]
am
34a62348: Merge "Fix
5581164: Use abbreviated day in lockscreen" into ics-mr1
* commit '
34a62348be92034a9fb7582e51754224785568dc':
Fix
5581164: Use abbreviated day in lockscreen
Jim Miller [Tue, 15 Nov 2011 23:42:20 +0000 (15:42 -0800)]
Merge "Fix
5581164: Use abbreviated day in lockscreen" into ics-mr1
Glenn Kasten [Tue, 15 Nov 2011 23:25:38 +0000 (15:25 -0800)]
Merge "Remove obsolete NativeWindow_fromSurfaceTexture"
Tsu Chiang Chuang [Tue, 15 Nov 2011 23:10:00 +0000 (15:10 -0800)]
am
c558a159: am
cce32110: am
d5897dc7: fix for build breakage.
* commit '
c558a15931324f06af23c2c1711b4375e15d45e3':
fix for build breakage.
Tsu Chiang Chuang [Tue, 15 Nov 2011 23:05:24 +0000 (15:05 -0800)]
am
cce32110: am
d5897dc7: fix for build breakage.
* commit '
cce32110e6f42378a76e0eb2495d24b6c8bc8ae7':
fix for build breakage.
Tsu Chiang Chuang [Tue, 15 Nov 2011 23:00:26 +0000 (15:00 -0800)]
am
d5897dc7: fix for build breakage.
* commit '
d5897dc7985e511c194f839d4b340fed2d63b41c':
fix for build breakage.
Jim Miller [Tue, 15 Nov 2011 22:59:07 +0000 (14:59 -0800)]
am
390811b8: am
b35a21f9: Merge "Fix
5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
* commit '
390811b8a4a08703b32d4d36bc6997798b52d341':
Fix
5602985: Show "Emergency calls only" when device has no SIM.
Jim Miller [Tue, 15 Nov 2011 22:54:50 +0000 (14:54 -0800)]
am
b35a21f9: Merge "Fix
5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
* commit '
b35a21f987b99cfe90f4c46e0a708703274b8f46':
Fix
5602985: Show "Emergency calls only" when device has no SIM.
Jim Miller [Tue, 15 Nov 2011 22:51:50 +0000 (14:51 -0800)]
Merge "Fix
5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
Jeff Brown [Tue, 15 Nov 2011 22:51:08 +0000 (14:51 -0800)]
am
d3b98329: am
d5713179: Merge "Override app requested orientation when docked." into ics-mr1
* commit '
d3b98329636ad089bb0b14cefa4b49d32e5ec678':
Override app requested orientation when docked.
Jeff Brown [Tue, 15 Nov 2011 22:48:25 +0000 (14:48 -0800)]
am
d5713179: Merge "Override app requested orientation when docked." into ics-mr1
* commit '
d5713179a0f68aa47a8cd966abc5324d43414b63':
Override app requested orientation when docked.
Jeff Brown [Tue, 15 Nov 2011 22:46:17 +0000 (14:46 -0800)]
Merge "Override app requested orientation when docked." into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 22:44:54 +0000 (14:44 -0800)]
am
d9070a08: am
5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1
* commit '
d9070a08807ee119d9d73052cc1ad1f1b29eb13d':
Improve low memory dropbox reporting.
Dianne Hackborn [Tue, 15 Nov 2011 22:42:11 +0000 (14:42 -0800)]
am
5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1
* commit '
5f11d73c918de72368ac5605c50f5fb9ac0457cb':
Improve low memory dropbox reporting.
Dianne Hackborn [Tue, 15 Nov 2011 22:39:37 +0000 (14:39 -0800)]
Merge "Improve low memory dropbox reporting." into ics-mr1
Jeff Brown [Tue, 15 Nov 2011 21:52:47 +0000 (13:52 -0800)]
Merge "Modify getState to prefer AKEY_STATE_DOWN and AKEY_STATE_UP over AKEY_STATE_UNKNOWN."
Jeff Brown [Tue, 15 Nov 2011 21:39:56 +0000 (13:39 -0800)]
Merge "POWER key is always a wake key."
Jake Hamby [Tue, 15 Nov 2011 21:34:57 +0000 (13:34 -0800)]
Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
Mathias Agopian [Tue, 15 Nov 2011 21:11:19 +0000 (13:11 -0800)]
am
556a406c: am
3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
* commit '
556a406cf4dd8a7faa318e0d522d899f8b9da7dc':
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
Mathias Agopian [Tue, 15 Nov 2011 21:11:17 +0000 (13:11 -0800)]
am
a0d32c4d: am
6b3ce09d: Merge "fix crash when validating an invalid EGL objects" into ics-mr1
* commit '
a0d32c4d094704fd6f4ccd3cba297a7c7d2f38fe':
fix crash when validating an invalid EGL objects
Winson Chung [Tue, 15 Nov 2011 21:11:14 +0000 (13:11 -0800)]
am
9ebb030a: am
e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug
5566846)" into ics-mr1
* commit '
9ebb030ad9eeb94bdf9e15b7a3f55d9792dda96b':
Defer adding large icon until when we compose the final notification. (Bug
5566846)
Danielle Millett [Tue, 15 Nov 2011 21:11:08 +0000 (13:11 -0800)]
am
8b6b92ea: (-s ours) am
49000016: am
8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0
* commit '
8b6b92ea5e257cd9d5799b74f64e7e1cc1ca3ddc':
DO NOT MERGE cherry picking from MR0 cl 148223
Eric Fischer [Tue, 15 Nov 2011 21:10:56 +0000 (13:10 -0800)]
am
66adcedb: (-s ours) am
3524831a: am
8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
66adcedbc635bbce37a849824d0cefceab810535':
Import revised translations. DO NOT MERGE
Tsu Chiang Chuang [Tue, 15 Nov 2011 21:07:26 +0000 (13:07 -0800)]
am
06e4a400: am
b3f2890a: am
047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
* commit '
06e4a40017f1af75ec58d9d942ef0c4ddad20fd2':
Adding mobile microbenchmark tests.
Gilles Debunne [Tue, 15 Nov 2011 21:07:14 +0000 (13:07 -0800)]
am
7bc6600e: am
8a440477: Merge "Clean-up in TextView" into ics-mr1
* commit '
7bc6600e60688ea37ee7f18b82cb16677c0f5e74':
Clean-up in TextView
John Reck [Tue, 15 Nov 2011 21:07:11 +0000 (13:07 -0800)]
am
6a622c56: am
a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
* commit '
6a622c5608e3f67efb7ba6a346ea4d8cfa5267ec':
Call onScrollChanged when scrolling layers
Hong Teng [Tue, 15 Nov 2011 21:07:07 +0000 (13:07 -0800)]
am
716747f7: am
481ffa50: Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
* commit '
716747f7cb29b45e41c2870f12d39095f4ed80c8':
Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Daniel Sandler [Tue, 15 Nov 2011 21:06:59 +0000 (13:06 -0800)]
am
50fb8a29: am
ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1
* commit '
50fb8a29f00e4414ef4961c4d2d6afca9ddf1659':
Bring back the 'more notifications' icon.
Jean-Michel Trivi [Tue, 15 Nov 2011 21:06:57 +0000 (13:06 -0800)]
am
87597d9c: am
538dc6ac: Merge "Fix
5615747 Don\'t leak remote control client death handlers" into ics-mr1
* commit '
87597d9ce00691f05703f728c17548df2bbc9cc2':
Fix
5615747 Don't leak remote control client death handlers
Wu-cheng Li [Tue, 15 Nov 2011 21:06:51 +0000 (13:06 -0800)]
am
4e1fed76: am
b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
* commit '
4e1fed76c19cc9656af55e57dc57979324322593':
Improve camera face detection javadoc.
Mathias Agopian [Tue, 15 Nov 2011 21:06:08 +0000 (13:06 -0800)]
am
3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
* commit '
3aa684ec0d3f70027fa808fb95b096a1613a1ddc':
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
Mathias Agopian [Tue, 15 Nov 2011 21:06:06 +0000 (13:06 -0800)]
am
6b3ce09d: Merge "fix crash when validating an invalid EGL objects" into ics-mr1
* commit '
6b3ce09d37fdb53a3a32e688017a5b343398c03b':
fix crash when validating an invalid EGL objects
Mathias Agopian [Tue, 15 Nov 2011 21:03:47 +0000 (13:03 -0800)]
Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
Mathias Agopian [Tue, 15 Nov 2011 21:03:22 +0000 (13:03 -0800)]
Merge "fix crash when validating an invalid EGL objects" into ics-mr1
Winson Chung [Tue, 15 Nov 2011 20:45:18 +0000 (12:45 -0800)]
am
e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug
5566846)" into ics-mr1
* commit '
e5129d7f49361df69e804a79696e28b213ea20b0':
Defer adding large icon until when we compose the final notification. (Bug
5566846)
Winson Chung [Tue, 15 Nov 2011 20:41:56 +0000 (12:41 -0800)]
Merge "Defer adding large icon until when we compose the final notification. (Bug
5566846)" into ics-mr1
Danielle Millett [Tue, 15 Nov 2011 20:21:01 +0000 (12:21 -0800)]
am
49000016: am
8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0
* commit '
4900001670c5229fa06e57821a3436023c25520d':
DO NOT MERGE cherry picking from MR0 cl 148223
Danielle Millett [Tue, 15 Nov 2011 20:16:59 +0000 (12:16 -0800)]
am
8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0
* commit '
8d8e669ea11d011b3e2320ad5dab580916b6d32e':
DO NOT MERGE cherry picking from MR0 cl 148223
Eric Fischer [Tue, 15 Nov 2011 19:55:54 +0000 (11:55 -0800)]
am
3524831a: am
8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
3524831a633693cf72880299706b2039d41c3b78':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 19:51:38 +0000 (11:51 -0800)]
am
8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
8d00c194c228e67851e5a0cb75c4bf4d99dd40f0':
Import revised translations. DO NOT MERGE
Michael Jurka [Tue, 15 Nov 2011 19:30:36 +0000 (11:30 -0800)]
am
729a9afe: am
4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
* commit '
729a9afe44c21cbe4e10ca4d6ba400641cc75cbc':
Updating recent apps visuals on tablet
Jeff Sharkey [Tue, 15 Nov 2011 19:30:34 +0000 (11:30 -0800)]
am
bc03c74c: am
d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit '
bc03c74c485669695805944a655795a6f9890956':
Conservatively trim data usage stats.
Nick Pelly [Tue, 15 Nov 2011 19:30:22 +0000 (11:30 -0800)]
am
26eeedce: am
b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
* commit '
26eeedceb12fa4d293f6e987115f0e2de54947b8':
Move nfc-extras tests into frameworks/base/nfc-extras/tests.
Adam Powell [Tue, 15 Nov 2011 19:30:13 +0000 (11:30 -0800)]
am
5d536c94: am
539bcca9: Merge "Fix bug
5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
* commit '
5d536c945da075036f151e5dbac86d74d32e2fc9':
Fix bug
5594320 - Overlay action bar decor layout causes two measure passes
Nick Pelly [Tue, 15 Nov 2011 19:30:10 +0000 (11:30 -0800)]
am
fb52c474: am
a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
* commit '
fb52c4747687819238eb4570ee7d424842c6159f':
Enforce 1-1 relationship between context and NfcAdapterExtras.
Dianne Hackborn [Tue, 15 Nov 2011 19:30:01 +0000 (11:30 -0800)]
am
f1c78890: am
91c2b5ce: Merge "Improve low memory reporting." into ics-mr1
* commit '
f1c78890dc703f44227b556e71624bed7eef95a1':
Improve low memory reporting.
Jeff Brown [Tue, 15 Nov 2011 19:29:59 +0000 (11:29 -0800)]
am
642de92b: am
9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1
* commit '
642de92b3500446ab2d2a84fbe4ff9c083e8c1af':
Fix races when content providers are acquired and released.
Dianne Hackborn [Tue, 15 Nov 2011 19:29:57 +0000 (11:29 -0800)]
am
74710e50: am
f10a5364: Merge "Maybe fix issue #
5405788: Device continuously opening and closing..." into ics-mr1
* commit '
74710e5041045251c43ff408641ec6818d23f985':
Maybe fix issue #
5405788: Device continuously opening and closing...
Daisuke Miyakawa [Tue, 15 Nov 2011 19:29:51 +0000 (11:29 -0800)]
am
f2213aca: am
d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
* commit '
f2213acaae5073ea3b4f3f566f0e8c7dc976765b':
Allow ContactsProvider to remove dulicates
Jamie Gennis [Tue, 15 Nov 2011 19:29:47 +0000 (11:29 -0800)]
am
c38d40de: am
6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1
* commit '
c38d40ded9810aa809489e080ee811bec86d546d':
EGL: add the ANDROID suffix to the blob cache ext
Tsu Chiang Chuang [Tue, 15 Nov 2011 19:13:45 +0000 (11:13 -0800)]
am
b3f2890a: am
047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
* commit '
b3f2890a8af3a99be1b0d5fd5a40df656cb60598':
Adding mobile microbenchmark tests.
Tsu Chiang Chuang [Tue, 15 Nov 2011 19:10:44 +0000 (11:10 -0800)]
am
047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
* commit '
047c4de2c548960fff428a92099003593cede5f8':
Adding mobile microbenchmark tests.
Bill Gruber [Tue, 15 Nov 2011 18:57:32 +0000 (10:57 -0800)]
Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
Adrian Ludwig [Tue, 15 Nov 2011 18:37:28 +0000 (10:37 -0800)]
Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
OSDN Git Service
