)]}' { "log": [ { "commit": "bbca81334e3603c7328dc526bd63032b23d5261d", "tree": "c29dd1ed7c2119cd50bbc4e56be9ee36d89891c7", "parents": [ "98a8231e838d7d624c5862d81d1975ef4f8d0d57", "4bb78889d04594c01a6af7f6d38c1764e9f575f9" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 23 16:16:54 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 16:16:54 2011 -0700" }, "message": "am 4bb78889: am 40277df7: Merge \"Add \"television\" mode.\" into honeycomb-mr2\n\n* commit \u00274bb78889d04594c01a6af7f6d38c1764e9f575f9\u0027:\n Add \"television\" mode.\n" }, { "commit": "4bb78889d04594c01a6af7f6d38c1764e9f575f9", "tree": "4c9a9c2907d9edb89752f234cb00648e775f99f3", "parents": [ "070eecef394175d7344cdadde675e8977a1609f0", "40277df7c33c0fc381eec589c768fe86de4b4404" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 23 16:07:43 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 16:07:43 2011 -0700" }, "message": "am 40277df7: Merge \"Add \"television\" mode.\" into honeycomb-mr2\n\n* commit \u002740277df7c33c0fc381eec589c768fe86de4b4404\u0027:\n Add \"television\" mode.\n" }, { "commit": "40277df7c33c0fc381eec589c768fe86de4b4404", "tree": "23d1d89d58e7b6edd43f837ed27fb01108f4fb08", "parents": [ "358d2cd96403383cfb91bb68598a4cb2fe2e170e", "e360bb6bd8ea84b8d37604fc11dfc744b18fb0de" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 23 15:18:20 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 15:18:20 2011 -0700" }, "message": "Merge \"Add \"television\" mode.\" into honeycomb-mr2" }, { "commit": "e360bb6bd8ea84b8d37604fc11dfc744b18fb0de", "tree": "7e833a630e8108be1345d8595438eea5a30e7173", "parents": [ "1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri May 20 16:11:04 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 23 15:11:08 2011 -0700" }, "message": "Add \"television\" mode.\n\nChange-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b\n" }, { "commit": "98a8231e838d7d624c5862d81d1975ef4f8d0d57", "tree": "e85a69162c52228c5d084f18429dd3b8a2888a81", "parents": [ "9a8ea20d4b3975d3f771364fb9f2272c32f8cad1", "59c87cb6074fe48dc0af20ef0082bdef0803dc45" ], "author": { "name": "TK MUN", "email": "tk.mun@samsung.com", "time": "Mon May 23 14:52:29 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 14:52:29 2011 -0700" }, "message": "am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received\n\n* commit \u002759c87cb6074fe48dc0af20ef0082bdef0803dc45\u0027:\n DO NOT MERGE SystemUI: update signal level when broadcast is received\n" }, { "commit": "59c87cb6074fe48dc0af20ef0082bdef0803dc45", "tree": "d13b8bebe4051a27c5039f1ced62dabf8d879188", "parents": [ "5b9ec6871afaf40325abe602cd1d29ddbd88cbb9", "6f0394a3b4d6082c9cb01de4a220a3b082e1840a" ], "author": { "name": "TK MUN", "email": "tk.mun@samsung.com", "time": "Mon May 23 14:47:38 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 14:47:38 2011 -0700" }, "message": "am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received\n\n* commit \u00276f0394a3b4d6082c9cb01de4a220a3b082e1840a\u0027:\n DO NOT MERGE SystemUI: update signal level when broadcast is received\n" }, { "commit": "9a8ea20d4b3975d3f771364fb9f2272c32f8cad1", "tree": "e85a69162c52228c5d084f18429dd3b8a2888a81", "parents": [ "b1817383050986413805fbbf2c1cc5c03417574d", "070eecef394175d7344cdadde675e8977a1609f0" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 13:42:14 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 13:42:14 2011 -0700" }, "message": "am 070eecef: Merge \"Map multiple apnType to one DataConnection fixes.\" into honeycomb-LTE\n\n* commit \u0027070eecef394175d7344cdadde675e8977a1609f0\u0027:\n Map multiple apnType to one DataConnection fixes.\n" }, { "commit": "b1817383050986413805fbbf2c1cc5c03417574d", "tree": "47ff135a71ec320d75c9c8f87f8126f8362d7769", "parents": [ "f55a00b1b86c58d78a4c2812d00e1b61d03f520a", "d3924fe9f6c99bc92ed86195e07ba82d39043812" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 13:42:11 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 13:42:11 2011 -0700" }, "message": "am d3924fe9: Merge \"Data Connection: Use Alarm for all delayed data retries.\" into honeycomb-LTE\n\n* commit \u0027d3924fe9f6c99bc92ed86195e07ba82d39043812\u0027:\n Data Connection: Use Alarm for all delayed data retries.\n" }, { "commit": "070eecef394175d7344cdadde675e8977a1609f0", "tree": "80ffbbe7d57f11f7a55445423380512eb41c554e", "parents": [ "d3924fe9f6c99bc92ed86195e07ba82d39043812", "a95bce0b29dd629b512b5e5aec8ece35f12be049" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 13:39:03 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 13:39:03 2011 -0700" }, "message": "Merge \"Map multiple apnType to one DataConnection fixes.\" into honeycomb-LTE" }, { "commit": "d3924fe9f6c99bc92ed86195e07ba82d39043812", "tree": "9e917637a9fba1b74baf15dc265fb9c386635470", "parents": [ "de60ce66c117ebd224b9d3181e2184ec5cfe87f9", "a88d76b7721d3a4e0be33fe990ba2d900f923241" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 13:38:36 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 13:38:36 2011 -0700" }, "message": "Merge \"Data Connection: Use Alarm for all delayed data retries.\" into honeycomb-LTE" }, { "commit": "6f0394a3b4d6082c9cb01de4a220a3b082e1840a", "tree": "1db6805efcbb480cba79b14264564af40f8168e6", "parents": [ "4c1e73b69a13a4f24a8fc123f599a9e9d8505525" ], "author": { "name": "TK MUN", "email": "tk.mun@samsung.com", "time": "Tue May 17 14:48:42 2011 +0900" }, "committer": { "name": "Simon Wilson", "email": "simonwilson@google.com", "time": "Mon May 23 13:12:55 2011 -0700" }, "message": "DO NOT MERGE SystemUI: update signal level when broadcast is received\n\n- Signal level updates should be updated whenever a signal change\nbroadcast is received but it is failing to do so.\n- Only when state change broadcast is received, signal level was\nupdated. (Ex: State: Idle -\u003e State: Connected)\n\nChange-Id: I71d86782143b3440a042164a87af64c7bee97ae2\nSigned-off-by: TK MUN \u003ctk.mun@samsung.com\u003e\n" }, { "commit": "f55a00b1b86c58d78a4c2812d00e1b61d03f520a", "tree": "9b0f55fd04a2ede19b08fbcc37974032729dcfc7", "parents": [ "d5762583bd1eb37da6c09461e8b2453c83a600a6", "de60ce66c117ebd224b9d3181e2184ec5cfe87f9" ], "author": { "name": "Shimeng (Simon) Wang", "email": "swang@google.com", "time": "Mon May 23 12:55:37 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 12:55:37 2011 -0700" }, "message": "am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.\n\n* commit \u0027de60ce66c117ebd224b9d3181e2184ec5cfe87f9\u0027:\n Simplify browser pause/resume logic to avoid stuck timer.\n" }, { "commit": "de60ce66c117ebd224b9d3181e2184ec5cfe87f9", "tree": "4cc56f96642bafdd4afea4a8609f86ee038fb1a7", "parents": [ "ebae1923869ee71ab119f766ac01c5a320619290", "358d2cd96403383cfb91bb68598a4cb2fe2e170e" ], "author": { "name": "Shimeng (Simon) Wang", "email": "swang@google.com", "time": "Mon May 23 12:14:04 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 12:14:04 2011 -0700" }, "message": "am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.\n\n* commit \u0027358d2cd96403383cfb91bb68598a4cb2fe2e170e\u0027:\n Simplify browser pause/resume logic to avoid stuck timer.\n" }, { "commit": "a95bce0b29dd629b512b5e5aec8ece35f12be049", "tree": "104f413a796c2af2d764ba722905a03417bcae6f", "parents": [ "ebae1923869ee71ab119f766ac01c5a320619290" ], "author": { "name": "Ramesh Sudini", "email": "ramesh.sudini@motorola.com", "time": "Tue May 17 09:05:40 2011 -0500" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 12:01:40 2011 -0700" }, "message": "Map multiple apnType to one DataConnection fixes.\n\nWith current design the code maps to the same DC, but no indications go out.\nWith this, making it more async in nature that the request goes all the way\nto DC and all the data indications would be triggered by parallel paths through DCT.\n\nChange-Id: I4c6e64912dafe19154d910bbd0441b10ada36cff\n" }, { "commit": "a88d76b7721d3a4e0be33fe990ba2d900f923241", "tree": "b770b87a55204282aa76d0e802343e09d01aec4a", "parents": [ "ebae1923869ee71ab119f766ac01c5a320619290" ], "author": { "name": "Ramesh Sudini", "email": "ramesh.sudini@motorola.com", "time": "Sun May 22 09:24:28 2011 -0500" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 12:01:31 2011 -0700" }, "message": "Data Connection: Use Alarm for all delayed data retries.\n\nChange-Id: I5045c3a10808b75f1ca3174bd1c16f332d5f7fa8\n" }, { "commit": "d5762583bd1eb37da6c09461e8b2453c83a600a6", "tree": "c5f6734e29b09f3e813e83b926440376ba4dc1be", "parents": [ "46e802e9c12befcd477e59437c5de3f0889aef4e", "ebae1923869ee71ab119f766ac01c5a320619290" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon May 23 10:26:40 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 10:26:40 2011 -0700" }, "message": "am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().\n\n* commit \u0027ebae1923869ee71ab119f766ac01c5a320619290\u0027:\n Add some logging to track down where ANR happens during MediaPlayer._release().\n" }, { "commit": "46e802e9c12befcd477e59437c5de3f0889aef4e", "tree": "662e6a15ff9d526ed70163eee15d41cdd9360f45", "parents": [ "ea182704b60551a9bd7760aa9d206ca7a7e407b8", "5b9ec6871afaf40325abe602cd1d29ddbd88cbb9" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 10:22:00 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 10:22:00 2011 -0700" }, "message": "am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.\n\n* commit \u00275b9ec6871afaf40325abe602cd1d29ddbd88cbb9\u0027:\n Merge e57aa434 from honeycomb-mr1. do not merge.\n" }, { "commit": "ea182704b60551a9bd7760aa9d206ca7a7e407b8", "tree": "662e6a15ff9d526ed70163eee15d41cdd9360f45", "parents": [ "162dd490cd0b502c717db59300b3fd902f76710a", "041fd74beade4e95cff6157af9dadbf9a99b7fcf" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 10:21:57 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 10:21:57 2011 -0700" }, "message": "am 041fd74b: (-s ours) am f791863f: Merge \"Merge 05b7b69c from honeycomb-mr1. do not merge.\" into gingerbread\n\n* commit \u0027041fd74beade4e95cff6157af9dadbf9a99b7fcf\u0027:\n Merge 05b7b69c from honeycomb-mr1. do not merge.\n" }, { "commit": "162dd490cd0b502c717db59300b3fd902f76710a", "tree": "662e6a15ff9d526ed70163eee15d41cdd9360f45", "parents": [ "6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e", "9d9a7466cd051748ba656acd39265099294c4153" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 10:21:49 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 10:21:49 2011 -0700" }, "message": "am 9d9a7466: (-s ours) am bb43828a: Merge \"Merge 2fae858d from Honeycomb-mr1. do not merge.\" into gingerbread\n\n* commit \u00279d9a7466cd051748ba656acd39265099294c4153\u0027:\n Merge 2fae858d from Honeycomb-mr1. do not merge.\n" }, { "commit": "358d2cd96403383cfb91bb68598a4cb2fe2e170e", "tree": "d32fe41ebe50e8ecc9d8e45f660e8d7d3b36a5ed", "parents": [ "a5293d1ca4459293f4993ea39c09ea703a022844" ], "author": { "name": "Shimeng (Simon) Wang", "email": "swang@google.com", "time": "Mon May 23 09:33:31 2011 -0700" }, "committer": { "name": "Shimeng (Simon) Wang", "email": "swang@google.com", "time": "Mon May 23 10:00:39 2011 -0700" }, "message": "Simplify browser pause/resume logic to avoid stuck timer.\n\nThe current browser pause/resume logic uses an integer count to track\nthe pause/resume behavior, which is mostly working fine in phone. The interger\ncount is usually 0 when browser is paused, and its value is usually 1\nwhen the browser is resumed and will trigger any delayed timer.\n\nBut in tablet, where tabs can be easily created/switched/deleted, this\nlogic will not work well and sometimes cause resources timers get stuck.\nFor example, in case multiple tabs are created, and you reload one of the\ntabs, when it\u0027s almost finished, switch to another tab, and hit home or power\nbutton, at this point of time, the browser will be suspended at\nController.java::onPause, hence the integer count will be 0; but since\nthe other tab is also finished after the pause, the current logic at\nController.java::onPageFinished will call pause timer again, which will make\nthe integer count to be -1. Before the time the browser is resumed, it\u0027s very\npossible some tabs will have some resources, such as images/flashs,\nscheduled to be loaded, these will be in delayed timer in\nResourceLoadScheduler.cpp\u0027s m_requestTimer.\nNow when the browser is resumed, the integer count will be 0, which will not\ntrigger delayed timer. Then all the new timers will be stuck as well since\nold timers are not executed yet.\n\nThe fix is to simplify the pause/resume logic by just using a boolean variable\ninstead of error-prone integer counting.\n\nissue: 4177932\nChange-Id: Id10af9298c7be1f82222d0b94c34c5dc68403630\n" }, { "commit": "ebae1923869ee71ab119f766ac01c5a320619290", "tree": "637528747980b5dce8746105856ef7616efe1d4c", "parents": [ "f96a6150e4e6c37f8952456bf9f84714f622713d", "a5293d1ca4459293f4993ea39c09ea703a022844" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon May 23 09:59:59 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 09:59:59 2011 -0700" }, "message": "am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().\n\n* commit \u0027a5293d1ca4459293f4993ea39c09ea703a022844\u0027:\n Add some logging to track down where ANR happens during MediaPlayer._release().\n" }, { "commit": "5b9ec6871afaf40325abe602cd1d29ddbd88cbb9", "tree": "bf01111cc496cf7a819b903fb157dd5fdd6c1143", "parents": [ "041fd74beade4e95cff6157af9dadbf9a99b7fcf", "4c1e73b69a13a4f24a8fc123f599a9e9d8505525" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 09:52:55 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 09:52:55 2011 -0700" }, "message": "am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.\n\n* commit \u00274c1e73b69a13a4f24a8fc123f599a9e9d8505525\u0027:\n Merge e57aa434 from honeycomb-mr1. do not merge.\n" }, { "commit": "041fd74beade4e95cff6157af9dadbf9a99b7fcf", "tree": "859be7bdb276321a9bc76e04b82e98c984533f6f", "parents": [ "9d9a7466cd051748ba656acd39265099294c4153", "f791863f0ac67ab6abd7410d5807d716cffc5b72" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 09:52:52 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 09:52:52 2011 -0700" }, "message": "am f791863f: Merge \"Merge 05b7b69c from honeycomb-mr1. do not merge.\" into gingerbread\n\n* commit \u0027f791863f0ac67ab6abd7410d5807d716cffc5b72\u0027:\n Merge 05b7b69c from honeycomb-mr1. do not merge.\n" }, { "commit": "9d9a7466cd051748ba656acd39265099294c4153", "tree": "169fdf062bd009c1d46fab2492641681e481ef9f", "parents": [ "d1735ef91af201ff140f8d954dd07eff80836d20", "bb43828aa749e71d4e52ba69db01b83c83a755b5" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 09:52:41 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 09:52:41 2011 -0700" }, "message": "am bb43828a: Merge \"Merge 2fae858d from Honeycomb-mr1. do not merge.\" into gingerbread\n\n* commit \u0027bb43828aa749e71d4e52ba69db01b83c83a755b5\u0027:\n Merge 2fae858d from Honeycomb-mr1. do not merge.\n" }, { "commit": "a5293d1ca4459293f4993ea39c09ea703a022844", "tree": "5041c7da18d8d33fe6c1c711bde87fc3b9f2a473", "parents": [ "2c7906eb392c6349e6f75fd2681310b934d6e262" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 19 15:56:50 2011 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon May 23 09:36:31 2011 -0700" }, "message": "Add some logging to track down where ANR happens during MediaPlayer._release().\n\no add a log message in AwesomePlayer::reset before acquiring the lock\n\nChange-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb\nrelated-to-bug: 4409547\n" }, { "commit": "6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e", "tree": "662e6a15ff9d526ed70163eee15d41cdd9360f45", "parents": [ "8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e", "f96a6150e4e6c37f8952456bf9f84714f622713d" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Sat May 21 13:02:17 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 21 13:02:17 2011 -0700" }, "message": "am f96a6150: Data reconnection issue after airplane mode\n\n* commit \u0027f96a6150e4e6c37f8952456bf9f84714f622713d\u0027:\n Data reconnection issue after airplane mode\n" }, { "commit": "8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e", "tree": "f21155baebf2d98d59b7d6cb5021d962463a5f35", "parents": [ "7abbf93c854cd7d272183b674373e989a05da6dd", "4c88be655e387011c6d57c6d68b5deb94f6ce601" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Sat May 21 12:50:18 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 21 12:50:18 2011 -0700" }, "message": "am 4c88be65: GSM DCT: Update poll stats to support multi-links\n\n* commit \u00274c88be655e387011c6d57c6d68b5deb94f6ce601\u0027:\n GSM DCT: Update poll stats to support multi-links\n" }, { "commit": "f96a6150e4e6c37f8952456bf9f84714f622713d", "tree": "8eaf4b232dcfb30c3186b41ba865473701ec08f8", "parents": [ "4c88be655e387011c6d57c6d68b5deb94f6ce601" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Sat May 21 02:15:20 2011 -0500" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Sat May 21 12:49:41 2011 -0700" }, "message": "Data reconnection issue after airplane mode\n\nApnContext and DC were not disassociated when force\n\"cleanUpConnection\" was called. Causing the setup\nrequest was not happening if applyNewStatus() was\nthe trigger.\n\nChange-Id: I6d73a53edb72bb9ab4ebb92fffd06e6fe1f0c4aa\n" }, { "commit": "4c88be655e387011c6d57c6d68b5deb94f6ce601", "tree": "5d7c134e749b8c43d7318251274ca376c58a50c5", "parents": [ "15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Fri May 20 19:32:24 2011 -0500" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Sat May 21 11:57:41 2011 -0700" }, "message": "GSM DCT: Update poll stats to support multi-links\n\nChange-Id: I654e38e71f9576ed2c4da59af563be04bc87045c\n" }, { "commit": "7abbf93c854cd7d272183b674373e989a05da6dd", "tree": "b9882b7dc0bb448785877b7c1f971cd235171b16", "parents": [ "f7bc0e28bf66c20ef233a161cd1d50a009013ab0", "15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Sat May 21 11:13:07 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 21 11:13:07 2011 -0700" }, "message": "am 15cd6ec2: Tear down connection with unwanted linkproperty change\n\n* commit \u002715cd6ec250d22a093af3961ae1ec3cbbdd49d6b1\u0027:\n Tear down connection with unwanted linkproperty change\n" }, { "commit": "15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1", "tree": "bfe74132dcb77236d293228389afd5baaaee4c8b", "parents": [ "16e8d22b206fb0c8b8b5a243ea13e08597f60ebc" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Sat May 21 10:05:26 2011 -0700" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Sat May 21 10:05:26 2011 -0700" }, "message": "Tear down connection with unwanted linkproperty change\n\nMake sure to disconnect the link when RIL reported link property change\nwhich could cause connectivity issue. (i.e. IP address)\n\nChange-Id: I6601ef53e4561bdc7d2760d00e134b8431512cb2\n" }, { "commit": "f7bc0e28bf66c20ef233a161cd1d50a009013ab0", "tree": "7edcf4615dd05bb3493167fefc2b05b2ce4452eb", "parents": [ "f8d70b14e4285d17d83cc4853f50b44d6a55fbc7", "16e8d22b206fb0c8b8b5a243ea13e08597f60ebc" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 23:37:28 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 23:37:28 2011 -0700" }, "message": "am 16e8d22b: Fix build.\n\n* commit \u002716e8d22b206fb0c8b8b5a243ea13e08597f60ebc\u0027:\n Fix build.\n" }, { "commit": "16e8d22b206fb0c8b8b5a243ea13e08597f60ebc", "tree": "cd9a551759388c66d6e13083b50a6def3ae5fd0d", "parents": [ "5f353de96beca0a400796887e737314a62e35b6a" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 23:31:29 2011 -0700" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 23:31:29 2011 -0700" }, "message": "Fix build.\n\nA merge accidentally included a line that was deleted.\n\nChange-Id: I991488ace290e5eb8eef3ca73f49c07d391028f5\n" }, { "commit": "f8d70b14e4285d17d83cc4853f50b44d6a55fbc7", "tree": "a864bf37336ab961531d1e8a121fafcf4ff6b791", "parents": [ "b7a13791a12eef57434b84a97609d98e03e17009", "5f353de96beca0a400796887e737314a62e35b6a" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 17:26:58 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 17:26:58 2011 -0700" }, "message": "am 5f353de9: Merge \"Notify RIL that PDP reset is triggered due to data stall\" into honeycomb-LTE\n\n* commit \u00275f353de96beca0a400796887e737314a62e35b6a\u0027:\n Notify RIL that PDP reset is triggered due to data stall\n" }, { "commit": "5f353de96beca0a400796887e737314a62e35b6a", "tree": "0c975bd7b7e2651a53e1050330755aa0f303de42", "parents": [ "393eb0d06b4536591584a8d4c5fb03c2962835a9", "edbe2cc386147dbac52b3bc74d8a15ad1f95b268" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 17:23:45 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 17:23:45 2011 -0700" }, "message": "Merge \"Notify RIL that PDP reset is triggered due to data stall\" into honeycomb-LTE" }, { "commit": "b7a13791a12eef57434b84a97609d98e03e17009", "tree": "65ae4146ef0ae8b109339ee3de605b3e0a09b3ac", "parents": [ "59a3319ffce100d671145b5bfee7450038b250bf", "393eb0d06b4536591584a8d4c5fb03c2962835a9" ], "author": { "name": "John Wang", "email": "johnwang@google.com", "time": "Fri May 20 17:22:50 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 17:22:50 2011 -0700" }, "message": "am 393eb0d0: Merge \"Add UI to handle SIM swap.\" into honeycomb-LTE\n\n* commit \u0027393eb0d06b4536591584a8d4c5fb03c2962835a9\u0027:\n Add UI to handle SIM swap.\n" }, { "commit": "393eb0d06b4536591584a8d4c5fb03c2962835a9", "tree": "45310b45738478c9052ce23749feaad5c8837783", "parents": [ "67cd389d4b9b6fd3ea0df8af57f58816d8005a4b", "10e9f668eec105699b8f10d544a418e5bf9605c5" ], "author": { "name": "John Wang", "email": "johnwang@google.com", "time": "Fri May 20 17:18:56 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 17:18:56 2011 -0700" }, "message": "Merge \"Add UI to handle SIM swap.\" into honeycomb-LTE" }, { "commit": "59a3319ffce100d671145b5bfee7450038b250bf", "tree": "c6c5cf774916c4fa23780604a19c3a2d3ff6a803", "parents": [ "0ba625259e8c4af3df2c7823fc1d18b42d760a44", "67cd389d4b9b6fd3ea0df8af57f58816d8005a4b" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri May 20 16:56:51 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 16:56:51 2011 -0700" }, "message": "am 67cd389d: am 2c7906eb: Merge \"Fix 4462474: Use new sw600dp resource target for LockScreen \u0026 SystemUI\" into honeycomb-mr2\n\n* commit \u002767cd389d4b9b6fd3ea0df8af57f58816d8005a4b\u0027:\n Fix 4462474: Use new sw600dp resource target for LockScreen \u0026 SystemUI\n" }, { "commit": "10e9f668eec105699b8f10d544a418e5bf9605c5", "tree": "ce8eae9ddfc8c80be69cc11619e3984806906e8d", "parents": [ "d9435bcecc820c8715d8b6b920fd43042418a1e9" ], "author": { "name": "John Wang", "email": "johnwang@google.com", "time": "Tue May 10 12:34:31 2011 -0700" }, "committer": { "name": "John Wang", "email": "johnwang@google.com", "time": "Fri May 20 16:52:51 2011 -0700" }, "message": "Add UI to handle SIM swap.\n\nbug:4364964\n\nChange-Id: Iadf466401a24dfbd638353d689e6ae89506afc97\n" }, { "commit": "edbe2cc386147dbac52b3bc74d8a15ad1f95b268", "tree": "0a90e17c5765f0ca7d25a93cd4faa8877455dee6", "parents": [ "2b534e770dadc4b3180863a393fd89094d0f07a7" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Thu May 19 20:42:59 2011 -0500" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 16:52:46 2011 -0700" }, "message": "Notify RIL that PDP reset is triggered due to data stall\n\nAdditional deactivate cause so RIL could take intelligent action\non data stall occurrence if necessary.\n\nChange-Id: Iae4accda879efb5679085c518117617fb16631c3\n" }, { "commit": "67cd389d4b9b6fd3ea0df8af57f58816d8005a4b", "tree": "d979a73236954c449e1ecc54618492aef3fe04c3", "parents": [ "2b534e770dadc4b3180863a393fd89094d0f07a7", "2c7906eb392c6349e6f75fd2681310b934d6e262" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri May 20 16:51:49 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 16:51:49 2011 -0700" }, "message": "am 2c7906eb: Merge \"Fix 4462474: Use new sw600dp resource target for LockScreen \u0026 SystemUI\" into honeycomb-mr2\n\n* commit \u00272c7906eb392c6349e6f75fd2681310b934d6e262\u0027:\n Fix 4462474: Use new sw600dp resource target for LockScreen \u0026 SystemUI\n" }, { "commit": "0ba625259e8c4af3df2c7823fc1d18b42d760a44", "tree": "1a070662d25448365004bb04c98323a626627d1d", "parents": [ "7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d", "2b534e770dadc4b3180863a393fd89094d0f07a7" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 16:51:29 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 16:51:29 2011 -0700" }, "message": "am 2b534e77: Merge \"Fix broken data retry\" into honeycomb-LTE\n\n* commit \u00272b534e770dadc4b3180863a393fd89094d0f07a7\u0027:\n Fix broken data retry\n" }, { "commit": "2c7906eb392c6349e6f75fd2681310b934d6e262", "tree": "5b38aa0c3f66c61cdd192089335bb191a582bfef", "parents": [ "bdc26dc34a5d848883d5acdee62f5b4403e8fe04", "024e429b49e70469fa20b4e3cac17e1921c68f9d" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri May 20 16:49:08 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 16:49:08 2011 -0700" }, "message": "Merge \"Fix 4462474: Use new sw600dp resource target for LockScreen \u0026 SystemUI\" into honeycomb-mr2" }, { "commit": "2b534e770dadc4b3180863a393fd89094d0f07a7", "tree": "ce496247ee929ca22e1c6bef6be1cbdb278107d1", "parents": [ "f483ed90401d63b7317f823fcac10315146d3072", "5ce6268faae8cb3114b64416ec336a528517f436" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 16:47:54 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 16:47:54 2011 -0700" }, "message": "Merge \"Fix broken data retry\" into honeycomb-LTE" }, { "commit": "7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d", "tree": "6a2d535d7e0d13c0f1f0f105e354bc54d7421928", "parents": [ "61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0", "f483ed90401d63b7317f823fcac10315146d3072" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri May 20 16:14:42 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 16:14:42 2011 -0700" }, "message": "am f483ed90: am bdc26dc3: Merge \"Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.\" into honeycomb-mr2\n\n* commit \u0027f483ed90401d63b7317f823fcac10315146d3072\u0027:\n Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.\n" }, { "commit": "61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0", "tree": "b57161b620a4f9c1bb585aef6f05b469d9acd654", "parents": [ "070a19e035cd28f2a0cc831f2322f2121d80de44", "f89ea7a5ec3af366a825c2e2cfc4f4c1f05de4c4" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 16:14:33 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 16:14:33 2011 -0700" }, "message": "am f89ea7a5: Merge \"Change getLteOnCdmaModeStatic to dynamically determine its result.\" into honeycomb-LTE\n\n* commit \u0027f89ea7a5ec3af366a825c2e2cfc4f4c1f05de4c4\u0027:\n Change getLteOnCdmaModeStatic to dynamically determine its result.\n" }, { "commit": "024e429b49e70469fa20b4e3cac17e1921c68f9d", "tree": "cb4b9335c41cf744604a7d95802cf0e5bf096fcc", "parents": [ "14e45f9b19a846af074d73b3792e35de0448ac21" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri May 20 15:46:24 2011 -0700" }, "committer": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri May 20 16:14:15 2011 -0700" }, "message": "Fix 4462474: Use new sw600dp resource target for LockScreen \u0026 SystemUI\n\nChange-Id: I79d4fe54c00ecb4c4a1ad614b94bb284b9ece5cc\n" }, { "commit": "070a19e035cd28f2a0cc831f2322f2121d80de44", "tree": "714d23f6081489a5504fdbe262456f43f4f48c68", "parents": [ "5a6bec53e224b2db9ecbc6920faab08f4a962256", "5c8caba2e590792531ffb2c9f4ea924993662abd" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri May 20 16:13:54 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 16:13:54 2011 -0700" }, "message": "am 5c8caba2: am 1b144e62: Merge \"Add ParcelFileDescriptor.fromFd() and .adoptFd().\" into honeycomb-mr2\n\n* commit \u00275c8caba2e590792531ffb2c9f4ea924993662abd\u0027:\n Add ParcelFileDescriptor.fromFd() and .adoptFd().\n" }, { "commit": "f483ed90401d63b7317f823fcac10315146d3072", "tree": "e28b64717ff4e90aa1d7ba2b41dc51f7bf1e35ae", "parents": [ "f89ea7a5ec3af366a825c2e2cfc4f4c1f05de4c4", "bdc26dc34a5d848883d5acdee62f5b4403e8fe04" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri May 20 16:02:21 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 16:02:21 2011 -0700" }, "message": "am bdc26dc3: Merge \"Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.\" into honeycomb-mr2\n\n* commit \u0027bdc26dc34a5d848883d5acdee62f5b4403e8fe04\u0027:\n Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.\n" }, { "commit": "bdc26dc34a5d848883d5acdee62f5b4403e8fe04", "tree": "55a5e12075688e927d3f05aebd0e4b9ca6b8adf2", "parents": [ "1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6", "3f4a764cf400aa209c1f8f76a1c73143eefc4905" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri May 20 15:59:19 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 15:59:19 2011 -0700" }, "message": "Merge \"Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.\" into honeycomb-mr2" }, { "commit": "3f4a764cf400aa209c1f8f76a1c73143eefc4905", "tree": "f0c291692f677866d82ed1e11cb19abbf8eb9f14", "parents": [ "73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri May 20 15:56:25 2011 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri May 20 15:56:25 2011 -0700" }, "message": "Change measurement of effective screen height for PopupWindow now that\nDisplayMetrics reports it without system decorations.\n\nChange-Id: I57f926de1cc7170b9996d7c71aa01542baf0c673\n" }, { "commit": "5a6bec53e224b2db9ecbc6920faab08f4a962256", "tree": "141aa9cdb446d7826247d0182a8d371257c5343b", "parents": [ "69ed0b628e18570f3fc7909fcdadc1e06f42e944", "dec3dda8730c8d2bd6e45171bf2d83bf89d5d806" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri May 20 15:45:55 2011 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri May 20 15:45:55 2011 -0700" }, "message": "resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp\n\nChange-Id: If14c7fc51c4549524c2f39797a902093582bae6d\n" }, { "commit": "5ce6268faae8cb3114b64416ec336a528517f436", "tree": "73e06d1575bb4a2daf8dec63b36eb64638aaace6", "parents": [ "f89ea7a5ec3af366a825c2e2cfc4f4c1f05de4c4" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Wed May 18 16:50:15 2011 -0500" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 15:31:33 2011 -0700" }, "message": "Fix broken data retry\n\nChange I2b737efa6092ad1254c8dc25840ec429f5c6e882 brought side\neffect that retry count is reset at every setup.\n\nChange-Id: I6f20d2e82110b2873ff5acbb60a747fd11c09c60\n" }, { "commit": "f89ea7a5ec3af366a825c2e2cfc4f4c1f05de4c4", "tree": "0f071d10cece92c12c36094d4716eced0c527d4e", "parents": [ "5c8caba2e590792531ffb2c9f4ea924993662abd", "fe071d3d37c8b3e2f332b5ad8c30f02717501153" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 15:27:03 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 15:27:03 2011 -0700" }, "message": "Merge \"Change getLteOnCdmaModeStatic to dynamically determine its result.\" into honeycomb-LTE" }, { "commit": "69ed0b628e18570f3fc7909fcdadc1e06f42e944", "tree": "7647be20455384ea164939aac812a3b1d96e8983", "parents": [ "e2271a55ad67f766a6a47239d1a3f7319a1e7b2e", "d1735ef91af201ff140f8d954dd07eff80836d20" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumarg@android.com", "time": "Fri May 20 14:52:48 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 14:52:48 2011 -0700" }, "message": "am d1735ef9: am 4b41df61: Merge \"Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.\"\n\n* commit \u0027d1735ef91af201ff140f8d954dd07eff80836d20\u0027:\n Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.\n" }, { "commit": "e2271a55ad67f766a6a47239d1a3f7319a1e7b2e", "tree": "6bfe10c1f5410a1d68a59e1c44ce5d14fe8595cb", "parents": [ "940138de9eae9be9ef60307af9e5f7a1168af533", "d7030e551aa99ed9f533d46de5f3443ceb4c5703" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumarg@android.com", "time": "Fri May 20 14:52:27 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 14:52:27 2011 -0700" }, "message": "am d7030e55: am 198ed3e4: Merge \"BT: Wrong publishing result of bonding error code.\"\n\n* commit \u0027d7030e551aa99ed9f533d46de5f3443ceb4c5703\u0027:\n BT: Wrong publishing result of bonding error code.\n" }, { "commit": "4c1e73b69a13a4f24a8fc123f599a9e9d8505525", "tree": "8f4ce5d09c152fee925aec054df1411294f65558", "parents": [ "f791863f0ac67ab6abd7410d5807d716cffc5b72" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu May 19 20:34:28 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri May 20 14:50:45 2011 -0700" }, "message": "Merge e57aa434 from honeycomb-mr1. do not merge.\n\nLayoutLib: Fix issue where \u003cinclude\u003e with no layout params wouldn\u0027t display.\n\nThe issue is that the layout params from the root element of the included\nlayout should be used but this failed because loading the layout params\nfrom the \u003cinclude\u003e tag didn\u0027t throw a RuntimeException in our modified\ncode (BridgeTypedArray).\n\nBecause we don\u0027t want to throw exception in general we only throw it\nwhen reading the layout params of an include node which is pretty crappy,\nbut works for now.\n\nChange-Id: I83ccf956e8b476f34dfc9a70aebae2288d53746e\n" }, { "commit": "5c8caba2e590792531ffb2c9f4ea924993662abd", "tree": "b85f3ac3c1e9c67b4f1f495653a6fc1884c1b1b6", "parents": [ "dec3dda8730c8d2bd6e45171bf2d83bf89d5d806", "1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri May 20 14:32:35 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 14:32:35 2011 -0700" }, "message": "am 1b144e62: Merge \"Add ParcelFileDescriptor.fromFd() and .adoptFd().\" into honeycomb-mr2\n\n* commit \u00271b144e625fb0d34cd680c44cbcfb2deb8a76d4c6\u0027:\n Add ParcelFileDescriptor.fromFd() and .adoptFd().\n" }, { "commit": "1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6", "tree": "487c236987816ed350411a8ca7f99a9a21074796", "parents": [ "14e45f9b19a846af074d73b3792e35de0448ac21", "ea2117bdc03316a9292e2344c6fd157c85c13167" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri May 20 14:28:43 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 14:28:43 2011 -0700" }, "message": "Merge \"Add ParcelFileDescriptor.fromFd() and .adoptFd().\" into honeycomb-mr2" }, { "commit": "dec3dda8730c8d2bd6e45171bf2d83bf89d5d806", "tree": "d9996fa59b75f87e5232604cfa6bc8ac59661bbf", "parents": [ "0a734b1894511e833936362820c9e8fec3ca7df3", "599115894f6f960a879d2e3036c547bbf4136020" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri May 20 14:25:29 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 14:25:29 2011 -0700" }, "message": "Merge \"Simplfy getActive* calls in ConnectivityService\" into honeycomb-LTE" }, { "commit": "d1735ef91af201ff140f8d954dd07eff80836d20", "tree": "856ae5891fac66368ecd236d0f6c18bbfc31ba92", "parents": [ "d7030e551aa99ed9f533d46de5f3443ceb4c5703", "4b41df613db19c5fe1d8c0d05ef314326fd3f95b" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumarg@android.com", "time": "Fri May 20 14:21:29 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 14:21:29 2011 -0700" }, "message": "am 4b41df61: Merge \"Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.\"\n\n* commit \u00274b41df613db19c5fe1d8c0d05ef314326fd3f95b\u0027:\n Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.\n" }, { "commit": "d7030e551aa99ed9f533d46de5f3443ceb4c5703", "tree": "f328c506e24313334ccd9a75fb590f205aec23af", "parents": [ "0c2d82c6f28ab6ec73d66fcc1f62e067829df426", "198ed3e46af4bd51fa6be0186bacdde9e832ba94" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumarg@android.com", "time": "Fri May 20 14:21:23 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 14:21:23 2011 -0700" }, "message": "am 198ed3e4: Merge \"BT: Wrong publishing result of bonding error code.\"\n\n* commit \u0027198ed3e46af4bd51fa6be0186bacdde9e832ba94\u0027:\n BT: Wrong publishing result of bonding error code.\n" }, { "commit": "f791863f0ac67ab6abd7410d5807d716cffc5b72", "tree": "1de9c8366d7aa93badd0bc264774ab0aa1899559", "parents": [ "bb43828aa749e71d4e52ba69db01b83c83a755b5", "d9af22e204e7f4c364c346b6c1bac900a2c4ccca" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri May 20 13:56:47 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 13:56:47 2011 -0700" }, "message": "Merge \"Merge 05b7b69c from honeycomb-mr1. do not merge.\" into gingerbread" }, { "commit": "bb43828aa749e71d4e52ba69db01b83c83a755b5", "tree": "14320d18e70dec062f6b7851b99fecc63904a178", "parents": [ "f2006f3123dcdf598e052051041b49c89710b53e", "e172a3fc23412ebc79d6bd93e6d43d4b1c58354b" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri May 20 13:56:42 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 13:56:42 2011 -0700" }, "message": "Merge \"Merge 2fae858d from Honeycomb-mr1. do not merge.\" into gingerbread" }, { "commit": "4b41df613db19c5fe1d8c0d05ef314326fd3f95b", "tree": "c3d3fde040603cf4cf297af85d8a1d284191c5cc", "parents": [ "198ed3e46af4bd51fa6be0186bacdde9e832ba94", "75d14c33d795621988a1df173d3d69abe0b6c8f4" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumarg@android.com", "time": "Fri May 20 13:37:00 2011 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Fri May 20 13:37:00 2011 -0700" }, "message": "Merge \"Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.\"" }, { "commit": "198ed3e46af4bd51fa6be0186bacdde9e832ba94", "tree": "82dd10eaf86701e609d98592bda98240766d2b31", "parents": [ "848a1e3d8522129c8a39d198a10b134926d71bd2", "ae5fbb0b4363a2a399e92e310777d7a955a25370" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumarg@android.com", "time": "Fri May 20 13:35:20 2011 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Fri May 20 13:35:20 2011 -0700" }, "message": "Merge \"BT: Wrong publishing result of bonding error code.\"" }, { "commit": "940138de9eae9be9ef60307af9e5f7a1168af533", "tree": "dec4dfc548f0ce3d51b677ed28bd8dab0d00b443", "parents": [ "7d75e772cbfe3f28451981f3e6b4d10f6a5ddc05", "0a734b1894511e833936362820c9e8fec3ca7df3" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri May 20 13:27:25 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 13:27:25 2011 -0700" }, "message": "am 0a734b18: am 14e45f9b: Merge \"Fix 4462497: Move layouts from xlarge to large to enable 7\" tablets\" into honeycomb-mr2\n\n* commit \u00270a734b1894511e833936362820c9e8fec3ca7df3\u0027:\n Fix 4462497: Move layouts from xlarge to large to enable 7\" tablets\n" }, { "commit": "7d75e772cbfe3f28451981f3e6b4d10f6a5ddc05", "tree": "29180558af96c6327b44ee871420500196099722", "parents": [ "f2004180f828584fa8525081a248e8c0f2055327", "ef2b26695e7fa00419787bb105d448a457e9ed83" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri May 20 13:27:00 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 13:27:00 2011 -0700" }, "message": "am ef2b2669: am 5e731140: Merge \"Fix 4462474: Fixes crash on 7\" tablet due to using wrong resource\" into honeycomb-mr2\n\n* commit \u0027ef2b26695e7fa00419787bb105d448a457e9ed83\u0027:\n Fix 4462474: Fixes crash on 7\" tablet due to using wrong resource\n" }, { "commit": "0a734b1894511e833936362820c9e8fec3ca7df3", "tree": "a804cbc245a3b942aa380abda13641fc5cd53997", "parents": [ "ef2b26695e7fa00419787bb105d448a457e9ed83", "14e45f9b19a846af074d73b3792e35de0448ac21" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri May 20 13:16:47 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 13:16:47 2011 -0700" }, "message": "am 14e45f9b: Merge \"Fix 4462497: Move layouts from xlarge to large to enable 7\" tablets\" into honeycomb-mr2\n\n* commit \u002714e45f9b19a846af074d73b3792e35de0448ac21\u0027:\n Fix 4462497: Move layouts from xlarge to large to enable 7\" tablets\n" }, { "commit": "ef2b26695e7fa00419787bb105d448a457e9ed83", "tree": "41bfcaf373cfc2d103e0f25018f388d3b6b107be", "parents": [ "f5abccefb10e8a31363c98d6a8491cb8168b7174", "5e731140f38e06c42885fa300efc30da00711c76" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri May 20 13:16:43 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 13:16:43 2011 -0700" }, "message": "am 5e731140: Merge \"Fix 4462474: Fixes crash on 7\" tablet due to using wrong resource\" into honeycomb-mr2\n\n* commit \u00275e731140f38e06c42885fa300efc30da00711c76\u0027:\n Fix 4462474: Fixes crash on 7\" tablet due to using wrong resource\n" }, { "commit": "14e45f9b19a846af074d73b3792e35de0448ac21", "tree": "edf712b75eee3ee3ac0fa43c990c9570cae2e27c", "parents": [ "5e731140f38e06c42885fa300efc30da00711c76", "74de8b923ab067a6f3cda628416a843451ab8807" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri May 20 13:13:19 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 13:13:19 2011 -0700" }, "message": "Merge \"Fix 4462497: Move layouts from xlarge to large to enable 7\" tablets\" into honeycomb-mr2" }, { "commit": "5e731140f38e06c42885fa300efc30da00711c76", "tree": "e2ab4b8f2e61982a560cbf72405110520a4b2d03", "parents": [ "73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed", "49b7adfdfb967307cccfe153bb75361166fcd077" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri May 20 13:12:57 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 13:12:57 2011 -0700" }, "message": "Merge \"Fix 4462474: Fixes crash on 7\" tablet due to using wrong resource\" into honeycomb-mr2" }, { "commit": "f2004180f828584fa8525081a248e8c0f2055327", "tree": "2cb968ccbd372d4a1d14bb8bd42ddc424fb8d7c6", "parents": [ "4d8ceada09441f43a98f5c7dadde9192e7d6abf9", "f5abccefb10e8a31363c98d6a8491cb8168b7174" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri May 20 13:09:13 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 13:09:13 2011 -0700" }, "message": "am f5abccef: am 73a31ec9: Merge \"New opaque cab assets; search dialog tweaks.\" into honeycomb-mr2\n\n* commit \u0027f5abccefb10e8a31363c98d6a8491cb8168b7174\u0027:\n New opaque cab assets; search dialog tweaks.\n" }, { "commit": "f5abccefb10e8a31363c98d6a8491cb8168b7174", "tree": "d9e2e7e7190d2aaa4daca8083a064601b9620353", "parents": [ "dbfd055d51b51b7a6f412155c2391666efbb638a", "73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri May 20 13:04:11 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 13:04:11 2011 -0700" }, "message": "am 73a31ec9: Merge \"New opaque cab assets; search dialog tweaks.\" into honeycomb-mr2\n\n* commit \u002773a31ec91c3e472503e9fbbfe82b8c3bbc5140ed\u0027:\n New opaque cab assets; search dialog tweaks.\n" }, { "commit": "73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed", "tree": "a4cca32ddcf01bc265ff5d6e548138d919ca0ddd", "parents": [ "a6f1104b9d829c636b60b9387e379f9667b5df09", "8abebcde3fd2317b25629263db6ad4637c8eeb34" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri May 20 12:59:43 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 20 12:59:43 2011 -0700" }, "message": "Merge \"New opaque cab assets; search dialog tweaks.\" into honeycomb-mr2" }, { "commit": "ea2117bdc03316a9292e2344c6fd157c85c13167", "tree": "f1bc6b8428311c333b94d08e58c17ede1b2e54d5", "parents": [ "69cb87576ba163b61bb0e6477a3b7c57a9b11d40" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri May 20 10:37:34 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri May 20 12:48:22 2011 -0700" }, "message": "Add ParcelFileDescriptor.fromFd() and .adoptFd().\n\nChange-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2\n" }, { "commit": "fe071d3d37c8b3e2f332b5ad8c30f02717501153", "tree": "44575bd3a66456cb5b50247848cb6402a5221824", "parents": [ "dbfd055d51b51b7a6f412155c2391666efbb638a" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 12:12:00 2011 -0700" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 12:27:16 2011 -0700" }, "message": "Change getLteOnCdmaModeStatic to dynamically determine its result.\n\nbug: 4202572\nChange-Id: I956b61840e2043229df29054dd2a6daccd7a845f\n" }, { "commit": "599115894f6f960a879d2e3036c547bbf4136020", "tree": "8c877dd193628f3ed2fa2f3a4452e58215947272", "parents": [ "dbfd055d51b51b7a6f412155c2391666efbb638a" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri May 20 12:23:41 2011 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri May 20 12:23:41 2011 -0700" }, "message": "Simplfy getActive* calls in ConnectivityService\n\nOne had been simplified on GB, but somehow it didn\u0027t make it here.\nbug: 4463770\n\nChange-Id: Ica51e836b1a7a489526a223168910b8e06c99c2b\n" }, { "commit": "4d8ceada09441f43a98f5c7dadde9192e7d6abf9", "tree": "ca436d9833cb77b160af28ecfc455533fc758b66", "parents": [ "3bec9cc27a4b87be644533d5fe44358dde399d49", "dbfd055d51b51b7a6f412155c2391666efbb638a" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri May 20 11:02:31 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 11:02:31 2011 -0700" }, "message": "am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.\n\n* commit \u0027dbfd055d51b51b7a6f412155c2391666efbb638a\u0027:\n Use pread() to get the decrypted data for container based DRM file. For bug 4392094.\n" }, { "commit": "dbfd055d51b51b7a6f412155c2391666efbb638a", "tree": "e0cb04fbfa58ab3e3cfd72db6042d23043f79721", "parents": [ "d9435bcecc820c8715d8b6b920fd43042418a1e9", "a6f1104b9d829c636b60b9387e379f9667b5df09" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri May 20 10:57:51 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 10:57:51 2011 -0700" }, "message": "am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.\n\n* commit \u0027a6f1104b9d829c636b60b9387e379f9667b5df09\u0027:\n Use pread() to get the decrypted data for container based DRM file. For bug 4392094.\n" }, { "commit": "3bec9cc27a4b87be644533d5fe44358dde399d49", "tree": "48bba09f3fea9673db74cd993221004f76653942", "parents": [ "33bdc3c9995cbef477cec756b65d767558e6b836", "0c2d82c6f28ab6ec73d66fcc1f62e067829df426" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumarg@android.com", "time": "Fri May 20 10:51:25 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 10:51:25 2011 -0700" }, "message": "am 0c2d82c6: am 848a1e3d: Merge \"OBEX: Fix PrivateOutputStream small write problem\"\n\n* commit \u00270c2d82c6f28ab6ec73d66fcc1f62e067829df426\u0027:\n OBEX: Fix PrivateOutputStream small write problem\n" }, { "commit": "0c2d82c6f28ab6ec73d66fcc1f62e067829df426", "tree": "58f492a559790c6d66cba8d797c93d03ff5d0b96", "parents": [ "2433c443bb5fe96d9a39b59e10e3c03d791e2278", "848a1e3d8522129c8a39d198a10b134926d71bd2" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumarg@android.com", "time": "Fri May 20 10:23:48 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 10:23:48 2011 -0700" }, "message": "am 848a1e3d: Merge \"OBEX: Fix PrivateOutputStream small write problem\"\n\n* commit \u0027848a1e3d8522129c8a39d198a10b134926d71bd2\u0027:\n OBEX: Fix PrivateOutputStream small write problem\n" }, { "commit": "a6f1104b9d829c636b60b9387e379f9667b5df09", "tree": "b15e56f9897fe165d49ac9e57a111df2f74f0824", "parents": [ "b4788fdbfdda97bd9cfd0e483276934114d9c438" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri May 20 10:15:21 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri May 20 10:15:21 2011 -0700" }, "message": "Use pread() to get the decrypted data for container based DRM file.\nFor bug 4392094.\n\nChange-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb\n" }, { "commit": "848a1e3d8522129c8a39d198a10b134926d71bd2", "tree": "b244ee37da3c234b009401df790336f658a65e4c", "parents": [ "6c427617be940be32fdebbd9c78f9223b292c814", "a9c4c594ef29e097be8be0537657fa8d9529502e" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumarg@android.com", "time": "Fri May 20 09:40:32 2011 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Fri May 20 09:40:32 2011 -0700" }, "message": "Merge \"OBEX: Fix PrivateOutputStream small write problem\"" }, { "commit": "33bdc3c9995cbef477cec756b65d767558e6b836", "tree": "647d850d1f2b703344661870c0a5ddd42e41e32c", "parents": [ "06a8ceacb0dc2713cb0bb2c93d2a750f2a58db68", "d9435bcecc820c8715d8b6b920fd43042418a1e9" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 06:51:14 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 06:51:14 2011 -0700" }, "message": "am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework\n\n* commit \u0027d9435bcecc820c8715d8b6b920fd43042418a1e9\u0027:\n Do not merge. Backport two fixes for InputMethethodFramework\n" }, { "commit": "d9435bcecc820c8715d8b6b920fd43042418a1e9", "tree": "0e1727820b6a6a4cfecfb9be26547dd08b8bb1f0", "parents": [ "c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a", "b4788fdbfdda97bd9cfd0e483276934114d9c438" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 06:41:03 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 06:41:03 2011 -0700" }, "message": "am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework\n\n* commit \u0027b4788fdbfdda97bd9cfd0e483276934114d9c438\u0027:\n Do not merge. Backport two fixes for InputMethethodFramework\n" }, { "commit": "b4788fdbfdda97bd9cfd0e483276934114d9c438", "tree": "b1551de9f7c570d15e716c2c64aeebbb8f5304f9", "parents": [ "69cb87576ba163b61bb0e6477a3b7c57a9b11d40" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 18:19:53 2011 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 22:11:54 2011 +0900" }, "message": "Do not merge. Backport two fixes for InputMethethodFramework\n\nBug: 3420384\n\nbackport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4\nbackport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942\n\nChange-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0\n" }, { "commit": "a9c4c594ef29e097be8be0537657fa8d9529502e", "tree": "b244ee37da3c234b009401df790336f658a65e4c", "parents": [ "6c427617be940be32fdebbd9c78f9223b292c814" ], "author": { "name": "Erik Ljungberg", "email": "erik.ljungberg@sonyericsson.com", "time": "Fri May 20 12:39:18 2011 +0200" }, "committer": { "name": "Johan Redestig", "email": "johan.redestig@sonyericsson.com", "time": "Fri May 20 12:39:18 2011 +0200" }, "message": "OBEX: Fix PrivateOutputStream small write problem\n\nWhen data less than max packet size in length is sent into the write\nmethod the data will only be added to the internal buffer. If several\ncalls to write is performed by the application continueOperation will\nnot be called at all. The solution to the problem is to always check\nthe internal buffer size and to call continueOperation every time\nmaxPacketSize bytes is in the internal buffer.\n\nChange-Id: I5ebfa3c26db2c1aefe1a115d7782d8ceaa760937\n" }, { "commit": "06a8ceacb0dc2713cb0bb2c93d2a750f2a58db68", "tree": "14cda7bbbdc5e6cabb492d7af1977a2f5548062b", "parents": [ "90177e59e5211dd9ab33761ce800e8a86a49d1e2", "c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu May 19 19:34:21 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 19 19:34:21 2011 -0700" }, "message": "am c851ea56: am 69cb8757: Add new \"-swNNNdp\" resource qualifier.\n\n* commit \u0027c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a\u0027:\n Add new \"-swNNNdp\" resource qualifier.\n" }, { "commit": "c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a", "tree": "c349206e8773ecdeb4cae8b537982b78e1c9d589", "parents": [ "d40575eb983eb7a1d383acc1f30f467374acd085", "69cb87576ba163b61bb0e6477a3b7c57a9b11d40" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu May 19 19:30:32 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 19 19:30:32 2011 -0700" }, "message": "am 69cb8757: Add new \"-swNNNdp\" resource qualifier.\n\n* commit \u002769cb87576ba163b61bb0e6477a3b7c57a9b11d40\u0027:\n Add new \"-swNNNdp\" resource qualifier.\n" }, { "commit": "8abebcde3fd2317b25629263db6ad4637c8eeb34", "tree": "e1609b97cb50a7e9da6f4eb70f9b04f49a249ea9", "parents": [ "b9537db8d9ee27efb4a98415ad2d6b50c1806e5d" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu May 19 18:46:47 2011 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu May 19 18:48:44 2011 -0700" }, "message": "New opaque cab assets; search dialog tweaks.\n\n* New opaque assets (now actually opaque!)\n\n* SearchDialog determines theme to use from parent context\n\n* SearchDialog now disallows action modes\n\nChange-Id: If05fe64d7cc4460678d78412275ee988ddb47e9e\n" }, { "commit": "69cb87576ba163b61bb0e6477a3b7c57a9b11d40", "tree": "a44be0af3d008409403be133358bdcd628741c01", "parents": [ "b9537db8d9ee27efb4a98415ad2d6b50c1806e5d" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu May 19 18:13:32 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu May 19 18:23:29 2011 -0700" }, "message": "Add new \"-swNNNdp\" resource qualifier.\n\nChange-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce\n" }, { "commit": "90177e59e5211dd9ab33761ce800e8a86a49d1e2", "tree": "76a0b398c19fcb397dbdf4651add1b96519ca506", "parents": [ "5b9ceebafd36db4491a49c1f00750ce50c4d4433", "d40575eb983eb7a1d383acc1f30f467374acd085" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu May 19 17:17:30 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 19 17:17:30 2011 -0700" }, "message": "am d40575eb: am b9537db8: Merge \"DO NOT MERGE Action bar config changes\" into honeycomb-mr2\n\n* commit \u0027d40575eb983eb7a1d383acc1f30f467374acd085\u0027:\n DO NOT MERGE Action bar config changes\n" }, { "commit": "49b7adfdfb967307cccfe153bb75361166fcd077", "tree": "c9b708049f23f3e0c045c976d3d1c4102378e6ef", "parents": [ "51fb97031f62b1181fc9eb6c636d09a68987d939" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Thu May 19 17:11:08 2011 -0700" }, "committer": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Thu May 19 17:11:08 2011 -0700" }, "message": "Fix 4462474: Fixes crash on 7\" tablet due to using wrong resource\n\nChange-Id: Id182bc6e9e69a308329412a91929a65af1329beb\n" }, { "commit": "d40575eb983eb7a1d383acc1f30f467374acd085", "tree": "098a824a74596631beadcbac1d5361251f1bc979", "parents": [ "a4815c0ec06c293ea9f50b2b925d5a98d11f1143", "b9537db8d9ee27efb4a98415ad2d6b50c1806e5d" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu May 19 17:06:09 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 19 17:06:09 2011 -0700" }, "message": "am b9537db8: Merge \"DO NOT MERGE Action bar config changes\" into honeycomb-mr2\n\n* commit \u0027b9537db8d9ee27efb4a98415ad2d6b50c1806e5d\u0027:\n DO NOT MERGE Action bar config changes\n" }, { "commit": "74de8b923ab067a6f3cda628416a843451ab8807", "tree": "50407957aad729fce063c282681202e758f6fe06", "parents": [ "51fb97031f62b1181fc9eb6c636d09a68987d939" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Thu May 19 17:05:30 2011 -0700" }, "committer": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Thu May 19 17:05:30 2011 -0700" }, "message": "Fix 4462497: Move layouts from xlarge to large to enable 7\" tablets\n\nThis fixes LockScreen on 7\" tablets by moving the resources to xlarge.\n\nIn addition, it has some minor layout tweaks to center pattern and\nwave unlock widgets on both so we can share the layout resources.\n\nChange-Id: Ibeee9320c9effcae6cf55c9ca417854f468c8edb\n" }, { "commit": "d9af22e204e7f4c364c346b6c1bac900a2c4ccca", "tree": "836e63535ac4ccdf3428f43b76e2f2a67f1ce538", "parents": [ "e172a3fc23412ebc79d6bd93e6d43d4b1c58354b" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 16 16:29:03 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu May 19 16:52:41 2011 -0700" }, "message": "Merge 05b7b69c from honeycomb-mr1. do not merge.\n\nChange-Id: I1aca5774dec2e18ab5f9e860f6fd90b481b2857c\nLayoutLib: support the new baseline/margin query API.\n" }, { "commit": "e172a3fc23412ebc79d6bd93e6d43d4b1c58354b", "tree": "7dd7aad58530ef14f09d47f1d43b0e5dcedba703", "parents": [ "8dd85f80ba9c463f5616b47eceb620fe21203f4f" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Mar 29 11:58:02 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu May 19 16:52:29 2011 -0700" }, "message": "Merge 2fae858d from Honeycomb-mr1. do not merge.\n\nChange-Id: I648f9ffa9745331ce4104dc4772f78ed933a4909\nLayoutLib: implement data binding for most AdapterView\n" }, { "commit": "b9537db8d9ee27efb4a98415ad2d6b50c1806e5d", "tree": "70353fa41e9f87e2681b80f5144f819ca1b7fbed", "parents": [ "9c9088a54f6dee7a13dcc7a12297137147b01baa", "dacbb746c99bd80bd618f1ba14eaa5a969e3b148" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu May 19 15:48:38 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 19 15:48:38 2011 -0700" }, "message": "Merge \"DO NOT MERGE Action bar config changes\" into honeycomb-mr2" }, { "commit": "dacbb746c99bd80bd618f1ba14eaa5a969e3b148", "tree": "545200490c43573b409cb35f1b228b93b0617aa7", "parents": [ "146a0b4522db2d782953a464fe63adcd7e1569c2" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu May 19 15:02:50 2011 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu May 19 15:38:27 2011 -0700" }, "message": "DO NOT MERGE Action bar config changes\n\nHandle action bar padding on configuration changes when the app\nhandles these changes itself.\n\nChange-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa\n" } ], "next": "5b9ceebafd36db4491a49c1f00750ce50c4d4433" }