OSDN Git Service
satok [Fri, 14 Jan 2011 08:15:41 +0000 (00:15 -0800)]
am
15572ff6: Merge "Save input method subtype even if the current IME is not running." into honeycomb
* commit '
15572ff6e57a5e60d57f4e16c1e196d9203559d9':
Save input method subtype even if the current IME is not running.
satok [Fri, 14 Jan 2011 08:13:16 +0000 (00:13 -0800)]
Merge "Save input method subtype even if the current IME is not running." into honeycomb
Jeff Hamilton [Fri, 14 Jan 2011 06:58:08 +0000 (22:58 -0800)]
Merge "resolved conflicts for merge of
06bb3aef to honeycomb-plus-aosp" into honeycomb-plus-aosp
Jeff Hamilton [Fri, 14 Jan 2011 06:38:31 +0000 (00:38 -0600)]
resolved conflicts for merge of
06bb3aef to honeycomb-plus-aosp
Change-Id: Ia7071ca07d917bd79e7697f4b0c0640ebb5f6a6f
Adam Powell [Fri, 14 Jan 2011 06:23:41 +0000 (22:23 -0800)]
am
2421cd42: Merge "Fix bug
3352112 - crash in AbsListView.smoothScrollBy" into honeycomb
* commit '
2421cd42292b3593716407847d2957f71c92c1fe':
Fix bug
3352112 - crash in AbsListView.smoothScrollBy
Adam Powell [Fri, 14 Jan 2011 06:21:15 +0000 (22:21 -0800)]
Merge "Fix bug
3352112 - crash in AbsListView.smoothScrollBy" into honeycomb
Dianne Hackborn [Fri, 14 Jan 2011 05:15:56 +0000 (21:15 -0800)]
am
84543705: Merge "Fix issue #
3330037: Unnecessary orientations appear..." into honeycomb
* commit '
84543705138ed67494b9ecd64fadf4ab0bf46a0e':
Fix issue #
3330037: Unnecessary orientations appear...
Dianne Hackborn [Fri, 14 Jan 2011 05:14:12 +0000 (21:14 -0800)]
Merge "Fix issue #
3330037: Unnecessary orientations appear..." into honeycomb
Jeff Brown [Fri, 14 Jan 2011 04:02:35 +0000 (20:02 -0800)]
am
370f01bd: Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb
* commit '
370f01bd42377dc1b150fa09515c4871ab763698':
Fix NPE in interceptKeyBeforeDispatching.
Jeff Brown [Fri, 14 Jan 2011 04:00:31 +0000 (20:00 -0800)]
Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb
Romain Guy [Fri, 14 Jan 2011 02:38:25 +0000 (18:38 -0800)]
am
5b907be8: Merge "Move the main thread check to the appropriate place." into honeycomb
* commit '
5b907be8f5c387e7580a8e43935250adabc408c8':
Move the main thread check to the appropriate place.
Romain Guy [Fri, 14 Jan 2011 02:36:13 +0000 (18:36 -0800)]
Merge "Move the main thread check to the appropriate place." into honeycomb
Xavier Ducrohet [Fri, 14 Jan 2011 02:32:10 +0000 (18:32 -0800)]
am
428a731d: Merge "LayoutLib: Fix multi-line text rendering." into honeycomb
* commit '
428a731db9a2e5bb273f122cc103ec32ad802f90':
LayoutLib: Fix multi-line text rendering.
Xavier Ducrohet [Fri, 14 Jan 2011 02:30:04 +0000 (18:30 -0800)]
Merge "LayoutLib: Fix multi-line text rendering." into honeycomb
Romain Guy [Fri, 14 Jan 2011 01:46:37 +0000 (17:46 -0800)]
am
24bb317f: Merge "Remove debug code" into honeycomb
* commit '
24bb317fe260300d03be42dcdd9aab210fbed45b':
Remove debug code
Romain Guy [Fri, 14 Jan 2011 01:44:28 +0000 (17:44 -0800)]
Merge "Remove debug code" into honeycomb
Jason Sams [Fri, 14 Jan 2011 01:24:12 +0000 (17:24 -0800)]
am
e9d3da13: Merge "Re-implement img npot support in HC." into honeycomb
* commit '
e9d3da1374a4ce06610675f1f9b578b62fc23449':
Re-implement img npot support in HC.
Romain Guy [Fri, 14 Jan 2011 01:22:06 +0000 (17:22 -0800)]
am
7f5690bb: Merge "Add debug logs for display lists." into honeycomb
* commit '
7f5690bb1089980a73ad5d6dea2177cb74e8c9e7':
Add debug logs for display lists.
Jason Sams [Fri, 14 Jan 2011 01:21:02 +0000 (17:21 -0800)]
Merge "Re-implement img npot support in HC." into honeycomb
Romain Guy [Fri, 14 Jan 2011 01:20:47 +0000 (17:20 -0800)]
Merge "Add debug logs for display lists." into honeycomb
Huahui Wu [Fri, 14 Jan 2011 01:04:39 +0000 (17:04 -0800)]
am
bfbb089c: Merge "b/
3133123 Pass touch point ids to WebKit." into honeycomb
* commit '
bfbb089c7fcb2bc74f55fe3c171ef1b6df78b2da':
b/
3133123 Pass touch point ids to WebKit.
Huahui Wu [Fri, 14 Jan 2011 01:02:33 +0000 (17:02 -0800)]
Merge "b/
3133123 Pass touch point ids to WebKit." into honeycomb
Kenny Root [Fri, 14 Jan 2011 00:57:31 +0000 (16:57 -0800)]
am
402438bb: Merge "Deep clone settings for system package update" into honeycomb
* commit '
402438bb40795a3608509f40bcff6245698185ad':
Deep clone settings for system package update
Kenny Root [Fri, 14 Jan 2011 00:55:00 +0000 (16:55 -0800)]
Merge "Deep clone settings for system package update" into honeycomb
Alex Sakhartchouk [Fri, 14 Jan 2011 00:29:14 +0000 (16:29 -0800)]
am
49dc58bf: Merge "Docs plus removing some junk per API review." into honeycomb
* commit '
49dc58bf1cb6ed971899cd8a9d43174723b14dcf':
Docs plus removing some junk per API review.
Alex Sakhartchouk [Fri, 14 Jan 2011 00:27:23 +0000 (16:27 -0800)]
Merge "Docs plus removing some junk per API review." into honeycomb
Jaikumar Ganesh [Fri, 14 Jan 2011 00:23:18 +0000 (16:23 -0800)]
am
e77e9da8: Merge "Fix bug in handling connect/disconnect multiple devices." into honeycomb
* commit '
e77e9da84946a2833ef8b0d1d476d6325768a244':
Fix bug in handling connect/disconnect multiple devices.
Jaikumar Ganesh [Fri, 14 Jan 2011 00:21:12 +0000 (16:21 -0800)]
Merge "Fix bug in handling connect/disconnect multiple devices." into honeycomb
Brad Fitzpatrick [Fri, 14 Jan 2011 00:18:51 +0000 (16:18 -0800)]
am
52ea9898: Merge "Remove accidental StrictMode logging left in." into honeycomb
* commit '
52ea989874160be47aad75b285503959c0e4c0bb':
Remove accidental StrictMode logging left in.
Brad Fitzpatrick [Fri, 14 Jan 2011 00:16:46 +0000 (16:16 -0800)]
Merge "Remove accidental StrictMode logging left in." into honeycomb
Dianne Hackborn [Thu, 13 Jan 2011 23:47:58 +0000 (15:47 -0800)]
am
8eca7a1e: Merge "Fix issue #
3153930: orphan window left on screen" into honeycomb
* commit '
8eca7a1e11d905e1d89d4c45adfe210536b5f521':
Fix issue #
3153930: orphan window left on screen
Dianne Hackborn [Thu, 13 Jan 2011 23:45:37 +0000 (15:45 -0800)]
Merge "Fix issue #
3153930: orphan window left on screen" into honeycomb
Guang Zhu [Thu, 13 Jan 2011 23:40:31 +0000 (15:40 -0800)]
am
2c037d14: Merge "remove runFinalizationSync calls" into honeycomb
* commit '
2c037d14b8dab0d863c7d380216316d03caaefc3':
remove runFinalizationSync calls
Guang Zhu [Thu, 13 Jan 2011 23:38:44 +0000 (15:38 -0800)]
Merge "remove runFinalizationSync calls" into honeycomb
Gilles Debunne [Thu, 13 Jan 2011 22:54:45 +0000 (14:54 -0800)]
am
783e6c8b: Merge "fix for cts DuplicateParentStateEnabled bug with TextViews." into honeycomb
* commit '
783e6c8b3ba7eecac3bdd796b53a1293f9cb1be4':
fix for cts DuplicateParentStateEnabled bug with TextViews.
Adam Powell [Thu, 13 Jan 2011 22:54:32 +0000 (14:54 -0800)]
am
379a51d9: Merge "Fix bug
3242262 - Add queryHint attribute for SearchView" into honeycomb
* commit '
379a51d96f1dc9db2dcc3288d536594c32f4b514':
Fix bug
3242262 - Add queryHint attribute for SearchView
Gilles Debunne [Thu, 13 Jan 2011 22:51:33 +0000 (14:51 -0800)]
Merge "fix for cts DuplicateParentStateEnabled bug with TextViews." into honeycomb
Adam Powell [Thu, 13 Jan 2011 22:51:16 +0000 (14:51 -0800)]
Merge "Fix bug
3242262 - Add queryHint attribute for SearchView" into honeycomb
Svetoslav Ganov [Thu, 13 Jan 2011 22:48:22 +0000 (14:48 -0800)]
am
cecb1db6: Merge "Invisible of gone views fire accessibility events." into honeycomb
* commit '
cecb1db6accffaa4749b1b0e71c0ec842c5b7a1a':
Invisible of gone views fire accessibility events.
Svetoslav Ganov [Thu, 13 Jan 2011 22:46:27 +0000 (14:46 -0800)]
Merge "Invisible of gone views fire accessibility events." into honeycomb
Christopher Tate [Thu, 13 Jan 2011 22:22:05 +0000 (14:22 -0800)]
am
6458202a: Merge "Suppress orientation changes during drag operations" into honeycomb
* commit '
6458202abe0c9df932f44223d05761673ba6e9fa':
Suppress orientation changes during drag operations
Christopher Tate [Thu, 13 Jan 2011 22:20:48 +0000 (14:20 -0800)]
Merge "Suppress orientation changes during drag operations" into honeycomb
Xavier Ducrohet [Thu, 13 Jan 2011 21:47:06 +0000 (13:47 -0800)]
am
a6cbd728: Merge "LayoutLib: Use the new log tag constants from LayoutLog" into honeycomb
* commit '
a6cbd72816932239a9d7e5fe665d05d6d0eae3bb':
LayoutLib: Use the new log tag constants from LayoutLog
Xavier Ducrohet [Thu, 13 Jan 2011 21:45:38 +0000 (13:45 -0800)]
Merge "LayoutLib: Use the new log tag constants from LayoutLog" into honeycomb
Jamie Gennis [Thu, 13 Jan 2011 21:00:10 +0000 (13:00 -0800)]
am
3defffe0: Merge "Fix remote GraphicBuffer allocation in SurfaceFlinger." into honeycomb
* commit '
3defffe06e6989506698ecdce1be3149a33774c1':
Fix remote GraphicBuffer allocation in SurfaceFlinger.
Jamie Gennis [Thu, 13 Jan 2011 20:58:09 +0000 (12:58 -0800)]
am
57ce3909: Merge "Add logging to SurfaceTextureClient." into honeycomb
* commit '
57ce3909fc05b06585bf11b14a704340a0763401':
Add logging to SurfaceTextureClient.
Jamie Gennis [Thu, 13 Jan 2011 20:57:21 +0000 (12:57 -0800)]
Merge "Fix remote GraphicBuffer allocation in SurfaceFlinger." into honeycomb
Jamie Gennis [Thu, 13 Jan 2011 20:56:38 +0000 (12:56 -0800)]
Merge "Add logging to SurfaceTextureClient." into honeycomb
Fabrice Di Meglio [Thu, 13 Jan 2011 20:46:55 +0000 (12:46 -0800)]
am
27ac243e: Merge "Print currentDestinationString() for each backup transport" into honeycomb
* commit '
27ac243e2dc4688b6e761edc3ee85eb7a3bf1f21':
Print currentDestinationString() for each backup transport
Jeff Hamilton [Thu, 13 Jan 2011 20:46:16 +0000 (12:46 -0800)]
am
52d3203e: Add dispatching overrides for foreground apps.
* commit '
52d3203ef69d4babbc4dd030a15c08c0b8d1d226':
Add dispatching overrides for foreground apps.
Fabrice Di Meglio [Thu, 13 Jan 2011 20:45:27 +0000 (12:45 -0800)]
Merge "Print currentDestinationString() for each backup transport" into honeycomb
Svetoslav Ganov [Thu, 13 Jan 2011 20:43:43 +0000 (12:43 -0800)]
am
462433ae: Merge "DatePicker is calling back its listener on init." into honeycomb
* commit '
462433ae94ff33f9591d910b662e63b821549cad':
DatePicker is calling back its listener on init.
Svetoslav Ganov [Thu, 13 Jan 2011 20:41:04 +0000 (12:41 -0800)]
Merge "DatePicker is calling back its listener on init." into honeycomb
Wei-Ta Chen [Thu, 13 Jan 2011 20:38:38 +0000 (12:38 -0800)]
am
62cd5c97: (-s ours) am
61d9ffbf: Merge "Do not merge." into gingerbread
* commit '
62cd5c9788abbd5b715ec2a6eaf64dd3945fdbaf':
Do not merge.
Gloria Wang [Thu, 13 Jan 2011 20:38:29 +0000 (12:38 -0800)]
am
1dac4cdd: am
a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '
1dac4cdd6faba15426a0b37a7a615c04f5a35394':
Initial OMA DRM forward lock contribution
Dan Morrill [Thu, 13 Jan 2011 20:21:07 +0000 (12:21 -0800)]
Merge "Fix merge conflict for '
c506ab89'" into honeycomb-plus-aosp
Jamie Gennis [Thu, 13 Jan 2011 02:30:40 +0000 (18:30 -0800)]
Fix remote GraphicBuffer allocation in SurfaceFlinger.
This change fixes a horrible hack that I did to allow application
processes to create GraphicBuffer objects by making a binder call to
SurfaceFlinger. This change introduces a new binder interface
specifically for doing this, and does it in such a way that
SurfaceFlinger will maintain a reference to the buffers until the app is
done with them.
Change-Id: Icb240397c6c206d7f69124c1497a829f051cb49b
Jamie Gennis [Thu, 13 Jan 2011 04:22:41 +0000 (20:22 -0800)]
Add logging to SurfaceTextureClient.
Change-Id: I984c3b9c88f8af613a50138188ff1b770e2de6b4
Jason parks [Thu, 13 Jan 2011 20:18:40 +0000 (12:18 -0800)]
am
a3cdaa53: Revert "Remove the APIs for the old encryption scheme."
* commit '
a3cdaa5337fa573c4c61770195d6232c2e587090':
Revert "Remove the APIs for the old encryption scheme."
Jason parks [Thu, 13 Jan 2011 20:15:43 +0000 (14:15 -0600)]
Revert "Remove the APIs for the old encryption scheme."
This reverts commit
1125d780a8b61703b8eb28c5c77dac5f3f0022dd.
Romain Guy [Thu, 13 Jan 2011 20:15:35 +0000 (12:15 -0800)]
am
c15c7a79: Merge "Cleanup implementation of hardware layers." into honeycomb
* commit '
c15c7a79a69733bd21d6548fd74c2874fdabe7e8':
Cleanup implementation of hardware layers.
Jamie Gennis [Thu, 13 Jan 2011 20:15:31 +0000 (12:15 -0800)]
am
5865c494: Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb
* commit '
5865c494a571a7e164218857d3b860004c50baf6':
Fix a bug in SurfaceTexture::dequeueBuffer.
Romain Guy [Thu, 13 Jan 2011 20:13:59 +0000 (12:13 -0800)]
Merge "Cleanup implementation of hardware layers." into honeycomb
Jamie Gennis [Thu, 13 Jan 2011 20:13:56 +0000 (12:13 -0800)]
Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb
Wei-Ta Chen [Thu, 13 Jan 2011 20:06:38 +0000 (12:06 -0800)]
am
61d9ffbf: Merge "Do not merge." into gingerbread
* commit '
61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
Do not merge.
Eric Laurent [Thu, 13 Jan 2011 20:02:35 +0000 (12:02 -0800)]
am
8eff4524: Merge "Fix issue
3302649." into honeycomb
* commit '
8eff45242180c7dec2b437c3929cb7ea3345f60c':
Fix issue
3302649.
Wei-Ta Chen [Thu, 13 Jan 2011 20:02:32 +0000 (12:02 -0800)]
Merge "Do not merge." into gingerbread
Eric Laurent [Thu, 13 Jan 2011 19:59:13 +0000 (11:59 -0800)]
Merge "Fix issue
3302649." into honeycomb
Dan Morrill [Thu, 13 Jan 2011 19:48:42 +0000 (11:48 -0800)]
Fix merge conflict for '
c506ab89'
Conflicts:
NOTICE
Change-Id: Iace8272fbb0f7b7d9a3adf521dcf3635abfc90e6
Jamie Gennis [Thu, 13 Jan 2011 19:31:03 +0000 (11:31 -0800)]
am
9aba2324: Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
* commit '
9aba2324ac8d7216732b42346bfcaf0be71eb22e':
Add getTransformMatrix to the SurfaceTexture API.
Jamie Gennis [Thu, 13 Jan 2011 19:29:14 +0000 (11:29 -0800)]
Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
Gloria Wang [Thu, 13 Jan 2011 19:11:51 +0000 (11:11 -0800)]
am
a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '
a220a2979937700024662be0f8fc166ca65506ed':
Initial OMA DRM forward lock contribution
Eric Fischer [Thu, 13 Jan 2011 19:03:47 +0000 (11:03 -0800)]
am
39d80c38: Merge "Import revised translations." into honeycomb
* commit '
39d80c3846972e6204dfd956263a3fb6a799444d':
Import revised translations.
Eric Fischer [Thu, 13 Jan 2011 18:59:52 +0000 (10:59 -0800)]
Merge "Import revised translations." into honeycomb
Gloria Wang [Thu, 13 Jan 2011 18:51:13 +0000 (10:51 -0800)]
Merge "Initial OMA DRM forward lock contribution"
Xavier Ducrohet [Thu, 13 Jan 2011 18:46:59 +0000 (10:46 -0800)]
am
310a4d81: LAyoutLib: Fix build by adding missing IWindowSession implementation.
* commit '
310a4d815b693e358d151b9aa2823c5022993f9b':
LAyoutLib: Fix build by adding missing IWindowSession implementation.
Xavier Ducrohet [Thu, 13 Jan 2011 18:28:05 +0000 (10:28 -0800)]
am
1f1957f5: Merge "LayoutLib: move MockView back into its original package." into honeycomb
* commit '
1f1957f50fec4bc8d8716793d22bb23ee7fb4a7f':
LayoutLib: move MockView back into its original package.
Xavier Ducrohet [Thu, 13 Jan 2011 18:28:02 +0000 (10:28 -0800)]
am
66a95e4d: Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb
* commit '
66a95e4dbeb1c6d33ceb7c320033041e7f8e2aaa':
LayoutLib: Add getViewParent/getViewIndex on RenderSession.
Nick Pelly [Thu, 13 Jan 2011 18:26:28 +0000 (10:26 -0800)]
am
18adceb4: am
a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
* commit '
18adceb4273655b6cf8eaa9c6a2237d6fc1b8881':
New Intent defined for RF ON/OFF events
Brad Fitzpatrick [Thu, 13 Jan 2011 18:26:19 +0000 (10:26 -0800)]
am
54f428a6: am
bdb7aee0: Merge "Fix for crash when setting live wallpaper."
* commit '
54f428a63f33f4722c09b7688e6ca7960394f81f':
Fix for crash when setting live wallpaper.
Kenny Root [Thu, 13 Jan 2011 18:26:13 +0000 (10:26 -0800)]
am
47075079: (-s ours) am
e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit '
470750793b6e930a323ee63cbed05c43dc435ba1':
Add the {get,set}PackageObbPaths calls to API
James Dong [Thu, 13 Jan 2011 18:24:44 +0000 (10:24 -0800)]
am
c14b10c3: Merge "Add audio encoding parameters check" into honeycomb
* commit '
c14b10c3068359b717b3f35b7218ce0e6dcdd08c':
Add audio encoding parameters check
Svetoslav Ganov [Thu, 13 Jan 2011 18:24:38 +0000 (10:24 -0800)]
am
06e32b43: Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb
* commit '
06e32b434b62b22eeee900851ff56f2098ddc019':
Updating the WebView accessibility key bindings after discussion with the access-eng team
Xavier Ducrohet [Thu, 13 Jan 2011 18:22:53 +0000 (10:22 -0800)]
Merge "LayoutLib: move MockView back into its original package." into honeycomb
Xavier Ducrohet [Thu, 13 Jan 2011 18:22:43 +0000 (10:22 -0800)]
Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb
James Dong [Thu, 13 Jan 2011 18:21:28 +0000 (10:21 -0800)]
Merge "Add audio encoding parameters check" into honeycomb
Jaikumar Ganesh [Thu, 13 Jan 2011 18:21:15 +0000 (10:21 -0800)]
am
b54fd91d: Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb
* commit '
b54fd91d1b843b7742bf6396cefa6c63b14dc6df':
Phone crash when old callback func is woken up when enabling BT.
Alex Sakhartchouk [Thu, 13 Jan 2011 18:20:28 +0000 (10:20 -0800)]
am
d88ad4ab: Merge "Documentation" into honeycomb
* commit '
d88ad4ab49280a19da6582ba6e776c296be79ec0':
Documentation
Robert Greenwalt [Thu, 13 Jan 2011 18:19:39 +0000 (10:19 -0800)]
am
495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
* commit '
495056ab6709bbf77879a4b556aa1d17446bfe48':
Turn off DUN connection after tethering.
Gilles Debunne [Thu, 13 Jan 2011 18:19:30 +0000 (10:19 -0800)]
am
b439221a: Merge "QuickContactBadge shows its pressed state" into honeycomb
* commit '
b439221a5aa7c36fedb242ee9180ce46e4ad19b7':
QuickContactBadge shows its pressed state
Dan Morrill [Thu, 13 Jan 2011 18:19:29 +0000 (10:19 -0800)]
am
4330b146: Adding ASL2 attribution for VisualOn.
* commit '
4330b1464d26fa693b61d496092e10ce0419ee3d':
Adding ASL2 attribution for VisualOn.
Svetoslav Ganov [Thu, 13 Jan 2011 18:17:02 +0000 (10:17 -0800)]
Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb
Jaikumar Ganesh [Thu, 13 Jan 2011 18:14:40 +0000 (10:14 -0800)]
Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb
Alex Sakhartchouk [Thu, 13 Jan 2011 18:14:14 +0000 (10:14 -0800)]
Merge "Documentation" into honeycomb
Robert Greenwalt [Thu, 13 Jan 2011 18:02:29 +0000 (10:02 -0800)]
Merge "Turn off DUN connection after tethering." into honeycomb
Gilles Debunne [Thu, 13 Jan 2011 17:50:40 +0000 (09:50 -0800)]
Merge "QuickContactBadge shows its pressed state" into honeycomb
Dan Morrill [Thu, 13 Jan 2011 17:24:01 +0000 (09:24 -0800)]
Adding ASL2 attribution for VisualOn.
Change-Id: I870133fc366507d95741f8aa234776de58ba60a9
Jason parks [Thu, 13 Jan 2011 15:44:55 +0000 (07:44 -0800)]
am
21f62b9e: Merge "Add a method enable encryption." into honeycomb
* commit '
21f62b9e461416ae61c8471f7199f104f8fe33de':
Add a method enable encryption.
Jason parks [Thu, 13 Jan 2011 15:42:55 +0000 (07:42 -0800)]
am
ca6777b2: Merge "Remove the APIs for the old encryption scheme." into honeycomb
* commit '
ca6777b23bbe9283380efb2ba7e6d0a79d8669db':
Remove the APIs for the old encryption scheme.
Jason parks [Thu, 13 Jan 2011 15:41:53 +0000 (07:41 -0800)]
Merge "Add a method enable encryption." into honeycomb
OSDN Git Service
