OSDN Git Service
The Android Open Source Project [Wed, 30 Nov 2011 20:56:14 +0000 (12:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8c28be97a60bc619a3d853c08d5c1dcbec1c7e20
Chih-Chung Chang [Wed, 30 Nov 2011 18:51:06 +0000 (10:51 -0800)]
am
764482c4: Merge "Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
* commit '
764482c4ebffc9c3cac21fcd8707811e981cd092':
Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
Chih-Chung Chang [Wed, 30 Nov 2011 18:51:00 +0000 (10:51 -0800)]
am
002a3fec: Fix
5686493: Crash when try to click any thumbnail
* commit '
002a3fece284f713537fad4523ee963d257350e9':
Fix
5686493: Crash when try to click any thumbnail
Daniel Sandler [Wed, 30 Nov 2011 18:50:55 +0000 (10:50 -0800)]
am
45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1
* commit '
45fa677140112f725df3765be56edc715c226aa5':
Improve screen on/off logic in slideshow.
The Android Automerger [Wed, 30 Nov 2011 14:46:42 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Wed, 30 Nov 2011 07:56:44 +0000 (23:56 -0800)]
Merge "Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
Chih-Chung Chang [Wed, 30 Nov 2011 06:32:35 +0000 (14:32 +0800)]
Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
Change-Id: Ia994264fb2c11fbc971840c8a103bbe9fa6ee7f7
Chih-Chung Chang [Wed, 30 Nov 2011 05:19:17 +0000 (13:19 +0800)]
Fix
5686493: Crash when try to click any thumbnail
Change-Id: Ia109333c3a207ca2a60889c2731f6c11737b5592
Daniel Sandler [Wed, 30 Nov 2011 02:19:16 +0000 (18:19 -0800)]
Merge "Improve screen on/off logic in slideshow." into ics-mr1
Eric Fischer [Tue, 29 Nov 2011 21:30:39 +0000 (13:30 -0800)]
am
4e94e885: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
4e94e8858fc3187ec0eae83c70698c85115a630e':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 21:26:56 +0000 (13:26 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 29 Nov 2011 21:18:10 +0000 (13:18 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ie6d712f4b1ddaa2916dae6ca973283e0dee00188
Jeff Brown [Tue, 29 Nov 2011 21:17:43 +0000 (13:17 -0800)]
am
881fd799: Merge "Add application launch category." into ics-mr1
* commit '
881fd799f1c54b934aa90310a54a145062264422':
Add application launch category.
Jeff Brown [Tue, 29 Nov 2011 21:14:17 +0000 (13:14 -0800)]
Merge "Add application launch category." into ics-mr1
The Android Automerger [Tue, 29 Nov 2011 20:03:31 +0000 (12:03 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 29 Nov 2011 19:07:11 +0000 (11:07 -0800)]
Merge "Import revised translations."
Eric Fischer [Tue, 29 Nov 2011 19:04:51 +0000 (11:04 -0800)]
Import revised translations.
Change-Id: I8bc47cbeb77931dd7003ce173680b39fd411b260
Wei Huang [Tue, 29 Nov 2011 18:04:02 +0000 (10:04 -0800)]
am
622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1
* commit '
622c2b2c7721008e7851d0af3d89d3fc545ceaf6':
Show a dialog to require updating PlusOne.
Wei Huang [Tue, 29 Nov 2011 17:58:18 +0000 (09:58 -0800)]
Merge "Show a dialog to require updating PlusOne." into ics-mr1
Chih-Chung Chang [Tue, 29 Nov 2011 17:56:48 +0000 (09:56 -0800)]
am
fc8c503d: Fix
5661035: Accepts bluetooth keys while playing a video from gallery.
* commit '
fc8c503d1351c6ee62d233a944f2bd5220e64a55':
Fix
5661035: Accepts bluetooth keys while playing a video from gallery.
Daniel Sandler [Mon, 28 Nov 2011 16:43:23 +0000 (11:43 -0500)]
Improve screen on/off logic in slideshow.
When used as a screensaver or otherwise, the slideshow
should not keep the screen on if the device is not plugged
in. It should also allow the screen to lock while the
slideshow is playing (otherwise a device left in this state
may be left unsecured for long periods by accident).
Additionally, when used as a screensaver, it must dismiss
the keyguard in order to be shown on a secured device.
Bug:
5660833
Change-Id: I1bafc50127aaa7ae2b67235d30736faa606c5ac1
Chih-Chung Chang [Tue, 29 Nov 2011 06:21:11 +0000 (14:21 +0800)]
Fix
5661035: Accepts bluetooth keys while playing a video from gallery.
Change-Id: I8174b1a97baad563d8bbd685b9aab3a8ca428ead
Jeff Brown [Tue, 29 Nov 2011 01:23:56 +0000 (17:23 -0800)]
Add application launch category.
Bug:
5674723
Change-Id: I6e2cbd2f456d93b4a4e05df5f3be5d3fb05385f0
The Android Automerger [Mon, 28 Nov 2011 20:22:56 +0000 (12:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Owen Lin [Thu, 24 Nov 2011 03:59:52 +0000 (11:59 +0800)]
Show a dialog to require updating PlusOne.
Change-Id: I1ff4f5eca90ade49b0785324b9319ef0b7d751ca
fix:
5608342
The Android Open Source Project [Tue, 22 Nov 2011 21:26:13 +0000 (13:26 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id5562da0ab0f961c8263b5a101a2ed3e32bd9b58
The Android Automerger [Tue, 22 Nov 2011 19:56:44 +0000 (11:56 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 22 Nov 2011 05:08:11 +0000 (21:08 -0800)]
am
f36d8f29: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
f36d8f299d57849a1afb1b0c271bb4be0d336e43':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 23:26:05 +0000 (15:26 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 21 Nov 2011 22:58:48 +0000 (14:58 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: If5d0d2f8c75a8b8a210a0fe1b1d22da682f08c81
Chih-Chung Chang [Mon, 21 Nov 2011 12:59:31 +0000 (04:59 -0800)]
am
8cbc7c4e: Merge "Fix
5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
* commit '
8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74':
Fix
5637927: NPE while trying to do slide show for gmail image attachment
Chih-Chung Chang [Mon, 21 Nov 2011 12:56:35 +0000 (04:56 -0800)]
Merge "Fix
5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
The Android Open Source Project [Fri, 18 Nov 2011 23:43:37 +0000 (15:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2
Ray Chen [Fri, 18 Nov 2011 23:23:07 +0000 (15:23 -0800)]
am
00b5f3c6: Fix
5635260 Albums view goes blank after changing view option and returning to albums view
* commit '
00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa':
Fix
5635260 Albums view goes blank after changing view option and returning to albums view
Wei Huang [Fri, 18 Nov 2011 10:37:31 +0000 (02:37 -0800)]
am
71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1
* commit '
71a296c27389fefa9361adada41715ae4623af32':
Make sure startAnimation won't be called after onPause.
Chih-Chung Chang [Fri, 18 Nov 2011 10:04:10 +0000 (18:04 +0800)]
Fix
5637927: NPE while trying to do slide show for gmail image attachment
Change-Id: If30aa9798a030a5b97c7ff626f91187d7da93ab5
Ray Chen [Fri, 18 Nov 2011 07:00:32 +0000 (15:00 +0800)]
Fix
5635260 Albums view goes blank after changing view option and returning to albums view
Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948
Wei Huang [Fri, 18 Nov 2011 00:56:49 +0000 (16:56 -0800)]
Merge "Make sure startAnimation won't be called after onPause." into ics-mr1
The Android Automerger [Thu, 17 Nov 2011 14:47:04 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Thu, 17 Nov 2011 13:45:46 +0000 (05:45 -0800)]
am
612e9d69: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
612e9d697269cff5437366ae386dea7d6af6656c':
Import revised translations. DO NOT MERGE
Owen Lin [Thu, 17 Nov 2011 07:26:56 +0000 (15:26 +0800)]
Make sure startAnimation won't be called after onPause.
Change-Id: I6c5238394b2ad64e22fbcb250ecd1534da7e8d03
fix:
5629252
Eric Fischer [Wed, 16 Nov 2011 18:53:11 +0000 (10:53 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Wed, 16 Nov 2011 18:17:05 +0000 (10:17 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I8d3977a59dd8ac6628b6e5095e76d9f26ab9f42f
The Android Automerger [Wed, 16 Nov 2011 14:46:48 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ray Chen [Wed, 16 Nov 2011 08:12:02 +0000 (00:12 -0800)]
am
d7401652: Fix
5611147 attachments (picture) can\'t be viewed after they\'re saved
* commit '
d74016524fa899747411240daa453e5ca9cac219':
Fix
5611147 attachments (picture) can't be viewed after they're saved
Ray Chen [Wed, 16 Nov 2011 03:12:47 +0000 (11:12 +0800)]
Fix
5611147 attachments (picture) can't be viewed after they're saved
Change-Id: I0de0b8c176e1c3f838e81e3549c6795613b90069
Eric Fischer [Tue, 15 Nov 2011 21:11:10 +0000 (13:11 -0800)]
am
8ab8a64c: (-s ours) am
756f9bc7: Import revised translations. DO NOT MERGE
* commit '
8ab8a64cc40a683d364829aad404fea4548cbd48':
Import revised translations. DO NOT MERGE
Wei Huang [Tue, 15 Nov 2011 21:11:00 +0000 (13:11 -0800)]
am
bfbd7bb4: Merge "Fix
5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1
* commit '
bfbd7bb47582be2a636eadffb041a698c52817f6':
Fix
5481444 Face clustering should use PWA profile shot instead of random photo
Yuli Huang [Tue, 15 Nov 2011 21:06:55 +0000 (13:06 -0800)]
am
c5d42ff7: Merge "Fix b/
5517002 by dismissing running progress dialog in onPause()." into ics-mr1
* commit '
c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b':
Fix b/
5517002 by dismissing running progress dialog in onPause().
Eric Fischer [Tue, 15 Nov 2011 20:19:48 +0000 (12:19 -0800)]
am
756f9bc7: Import revised translations. DO NOT MERGE
* commit '
756f9bc72468a6fba926602b86525aed7bb05b40':
Import revised translations. DO NOT MERGE
Wei Huang [Tue, 15 Nov 2011 20:12:03 +0000 (12:12 -0800)]
Merge "Fix
5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1
Owen Lin [Tue, 15 Nov 2011 19:30:08 +0000 (11:30 -0800)]
am
c903fd67: Fix the memory leak by WeakHashMap.
* commit '
c903fd67c26d652f9dbd5cb321b64d1601357985':
Fix the memory leak by WeakHashMap.
Yuli Huang [Tue, 15 Nov 2011 15:18:16 +0000 (07:18 -0800)]
Merge "Fix b/
5517002 by dismissing running progress dialog in onPause()." into ics-mr1
The Android Automerger [Tue, 15 Nov 2011 14:46:32 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Yuli Huang [Mon, 14 Nov 2011 14:38:16 +0000 (22:38 +0800)]
Fix b/
5517002 by dismissing running progress dialog in onPause().
Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a
Eric Fischer [Mon, 14 Nov 2011 21:32:51 +0000 (13:32 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I325ec90678dbd808dc4cab87de77ddfcc8ececf2
Owen Lin [Mon, 14 Nov 2011 04:23:03 +0000 (12:23 +0800)]
Fix the memory leak by WeakHashMap.
fix:
5601885
Also simplify the code.
Change-Id: I97cdf00d84fa093ad7032e85ec7c31c3365e2447
The Android Automerger [Sun, 13 Nov 2011 14:47:17 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ray Chen [Fri, 11 Nov 2011 19:48:32 +0000 (11:48 -0800)]
am
c9af80a1: Merge "Fix
5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
* commit '
c9af80a1e46106b93271903753d36682b480479c':
Fix
5213252 [UI] Updated action bar layouts and action orders
Ray Chen [Thu, 3 Nov 2011 09:51:38 +0000 (17:51 +0800)]
Fix
5481444 Face clustering should use PWA profile shot instead of random photo
Change-Id: Ie4e3f9ae19431ab5b36d216cd7f4c626de503bbf
Owen Lin [Fri, 11 Nov 2011 10:17:26 +0000 (18:17 +0800)]
resolved conflicts for merge of
64d592c0 to master
Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059
Ray Chen [Fri, 11 Nov 2011 07:33:43 +0000 (23:33 -0800)]
Merge "Fix
5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
Owen Lin [Fri, 11 Nov 2011 06:36:40 +0000 (06:36 +0000)]
am
d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1
* commit '
d80bb5974b0ec43ca1755aff4287fc7815504058':
Show control overlay when earphone is unplugged
Yuli Huang [Fri, 11 Nov 2011 06:36:40 +0000 (06:36 +0000)]
am
e193bc40: Merge "Fix b/
5518211 by disabling effects when photo cannot be loaded." into ics-mr1
* commit '
e193bc40110b0606806c864234e95141be6bd312':
Fix b/
5518211 by disabling effects when photo cannot be loaded.
Chih-Chung Chang [Fri, 11 Nov 2011 06:36:39 +0000 (06:36 +0000)]
am
b86c6aa0: Fix
5548567: Don\'t play video immediately.
* commit '
b86c6aa085a66ffee2a178f4b5e2426cc67ca90b':
Fix
5548567: Don't play video immediately.
Owen Lin [Fri, 11 Nov 2011 06:34:30 +0000 (22:34 -0800)]
Merge "Request sync when opening Gallery/Album." into ics-mr1
Owen Lin [Fri, 11 Nov 2011 06:33:16 +0000 (22:33 -0800)]
Merge "Show control overlay when earphone is unplugged" into ics-mr1
Owen Lin [Fri, 11 Nov 2011 04:01:09 +0000 (12:01 +0800)]
Show control overlay when earphone is unplugged
Change-Id: I3e259e66d318010a3f9e9b47b561a09b2db2b6a5
fix:
5563251
Yuli Huang [Fri, 11 Nov 2011 02:58:20 +0000 (18:58 -0800)]
Merge "Fix b/
5518211 by disabling effects when photo cannot be loaded." into ics-mr1
Owen Lin [Tue, 8 Nov 2011 11:05:56 +0000 (19:05 +0800)]
Request sync when opening Gallery/Album.
fix:
5519437
Change-Id: I0fb60415e3a92a677ca72ee8e0b95ae57e802152
Eric Fischer [Thu, 10 Nov 2011 23:01:57 +0000 (15:01 -0800)]
Merge "Import revised translations."
The Android Open Source Project [Thu, 10 Nov 2011 22:36:29 +0000 (14:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7af0b572fb36c3c93761232c46d9adf74da8aacd
Eric Fischer [Thu, 10 Nov 2011 22:12:56 +0000 (14:12 -0800)]
Import revised translations.
Change-Id: I34e26a60238c1a846f6f9a327db7b892737539cf
Chih-Chung Chang [Thu, 10 Nov 2011 18:51:13 +0000 (18:51 +0000)]
am
af92c510: Merge "Fix
5585254: Make system UI enter "low profile mode" while playing." into ics-mr1
* commit '
af92c5100158fe39cca21abb76ca685bfe106eeb':
Fix
5585254: Make system UI enter "low profile mode" while playing.
The Android Automerger [Thu, 10 Nov 2011 14:47:10 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Thu, 10 Nov 2011 10:01:33 +0000 (18:01 +0800)]
Fix
5548567: Don't play video immediately.
Change-Id: I30e9ebf7461e12250e1ef240c157e7f59b1ce2a1
Ray Chen [Wed, 9 Nov 2011 02:49:09 +0000 (10:49 +0800)]
Fix
5213252 [UI] Updated action bar layouts and action orders
Change-Id: I798a86ed1f6883af1ea3cd3e9c67a6603d0273cc
Yuli Huang [Thu, 10 Nov 2011 08:50:31 +0000 (16:50 +0800)]
Fix b/
5518211 by disabling effects when photo cannot be loaded.
Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335
Ray Chen [Thu, 10 Nov 2011 07:01:49 +0000 (23:01 -0800)]
Merge "Fix
5453262 No pictures / Videos available in Gallery message not displayed"
Yuli Huang [Thu, 10 Nov 2011 05:42:56 +0000 (05:42 +0000)]
am
8cfe549a: Fix b/
5587210: Add file extension to display-name.
* commit '
8cfe549a3c6e50653ce50cedf90e8463d641987d':
Fix b/
5587210: Add file extension to display-name.
Chih-Chung Chang [Thu, 10 Nov 2011 04:17:38 +0000 (20:17 -0800)]
Merge "Fix
5585254: Make system UI enter "low profile mode" while playing." into ics-mr1
Yuli Huang [Thu, 10 Nov 2011 01:11:46 +0000 (01:11 +0000)]
am
90b7a7a1: Fix b/
5510870 by persisting states of save/share buttons.
* commit '
90b7a7a1fed287cab3500acdfaf4e82ec0a59dec':
Fix b/
5510870 by persisting states of save/share buttons.
Yuli Huang [Wed, 9 Nov 2011 18:10:10 +0000 (02:10 +0800)]
Fix b/
5587210: Add file extension to display-name.
Change-Id: I7c3522f2532bbce688ee8d4d0403f7314baca481
The Android Automerger [Wed, 9 Nov 2011 18:06:23 +0000 (10:06 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 9 Nov 2011 14:47:40 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Yuli Huang [Wed, 9 Nov 2011 14:34:20 +0000 (14:34 +0000)]
am
738e82e1: Fix b/
5510870 by saving/restoring Activity states.
* commit '
738e82e163f90e1fe7aeef8bd153dc7763631f30':
Fix b/
5510870 by saving/restoring Activity states.
Chih-Chung Chang [Wed, 9 Nov 2011 12:57:53 +0000 (20:57 +0800)]
Fix
5585254: Make system UI enter "low profile mode" while playing.
Change-Id: I91f680871b7a965f6776cb017dcd825a587e5054
Yuli Huang [Wed, 9 Nov 2011 07:10:45 +0000 (15:10 +0800)]
Fix b/
5510870 by persisting states of save/share buttons.
Change-Id: Ida5c2868199b75a1a710ee5b92e0e3dffd71cec6
Ray Chen [Wed, 9 Nov 2011 08:13:19 +0000 (16:13 +0800)]
Fix
5453262 No pictures / Videos available in Gallery message not displayed
Change-Id: Ib6c8691e4206f9d6a07a7587d22a67c1a21bc5a5
Yuli Huang [Tue, 8 Nov 2011 18:49:14 +0000 (18:49 +0000)]
am
13105e73: Merge "Add face tanning effect to gallery" into ics-mr1
* commit '
13105e73298f7ed0031232d48a7cf43ac4c0d21f':
Add face tanning effect to gallery
Yuli Huang [Fri, 4 Nov 2011 08:39:50 +0000 (16:39 +0800)]
Fix b/
5510870 by saving/restoring Activity states.
1. Filters implement Parcelable for saving/restoring states.
2. Extract Doodle for making doodling paths parcelable.
Change-Id: Ice8e6e068891da8a8f9251e62d95ea755fa99933
The Android Automerger [Tue, 8 Nov 2011 14:46:22 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Yuli Huang [Tue, 8 Nov 2011 03:58:36 +0000 (19:58 -0800)]
Merge "Add face tanning effect to gallery" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:41:00 +0000 (20:41 +0000)]
am
826c44f2: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
826c44f23e8f3a5b9b5ed0227816f0a6441b5ed8':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Nov 2011 20:36:26 +0000 (12:36 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:26:25 +0000 (12:26 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I60c0c0e36909fdad936f20880904a18ccddb503c
Wei Huang [Mon, 7 Nov 2011 18:57:34 +0000 (18:57 +0000)]
am
e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1
* commit '
e9560e6c7bc55718c46264ac03eb7b44bfc857f2':
Change OK to CROP fro CropImage.
Wei Huang [Mon, 7 Nov 2011 18:54:46 +0000 (10:54 -0800)]
Merge "Change OK to CROP fro CropImage." into ics-mr1
Chih-Chung Chang [Mon, 7 Nov 2011 18:34:30 +0000 (18:34 +0000)]
am
d6985f9b: Fix
5457600: In UriImage, read exif to determine orientation.
* commit '
d6985f9ba58c11c29760f28be07ebd229a9b7a39':
Fix
5457600: In UriImage, read exif to determine orientation.
The Android Open Source Project [Mon, 7 Nov 2011 16:31:56 +0000 (08:31 -0800)]
Reconcile with ics-mr1-release
Change-Id: I0eb3a8338e095504809785f4f9ff15c0e8fc7329