)]}'
{
  "log": [
    {
      "commit": "2ff585f4bdcce8a8db81956c2fba1c12db7f8a9d",
      "tree": "c7f43c11593feb1bb9bd3c6b526fabad6d6cd00f",
      "parents": [
        "79021f4b514a3847263586df8702a98af3a1d0d1"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Wed Jun 10 16:01:54 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Wed Jun 10 16:15:32 2009 -0700"
      },
      "message": "fix a bug where copybit only renders in the first buffer when used with s/w GL\n"
    },
    {
      "commit": "79021f4b514a3847263586df8702a98af3a1d0d1",
      "tree": "2224d3e113d4798d21c1ae897ffed3c221b9cfe7",
      "parents": [
        "348514d9be0488a1bda9680ea2f5da9ae779faa6"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Tue Jun 09 21:38:08 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Tue Jun 09 21:38:08 2009 -0700"
      },
      "message": "revive the copybit test.\n"
    },
    {
      "commit": "348514d9be0488a1bda9680ea2f5da9ae779faa6",
      "tree": "dc163ca27a0032b4dcc958aa09666a4a511aa251",
      "parents": [
        "6f74b0cc490a3b8523252ded00f7ca55160effd1"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Thu Jun 04 23:29:29 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Thu Jun 04 23:29:29 2009 -0700"
      },
      "message": "cleanup Debug.h a bit\n"
    },
    {
      "commit": "6f74b0cc490a3b8523252ded00f7ca55160effd1",
      "tree": "2f50b400e0f979c7dfff6b16b5feb5ed8ec7c72e",
      "parents": [
        "cf77b16ef9e081baf76877ab7ed99de734fcf2ea"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Wed Jun 03 17:32:49 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Wed Jun 03 17:32:49 2009 -0700"
      },
      "message": "fix build\n"
    },
    {
      "commit": "cf77b16ef9e081baf76877ab7ed99de734fcf2ea",
      "tree": "34ba0bdc048129fa15edb3f7e013b78c700ea347",
      "parents": [
        "0b4a2fb7ce6961e27a3cf082297277a53ef2d524",
        "273d098cc72a88c797d01c7dff0c1350f315f05f"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Mon Jun 01 14:30:08 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Mon Jun 01 14:30:08 2009 -0700"
      },
      "message": "Merge commit \u0027goog/master\u0027 into merge_master\n"
    },
    {
      "commit": "273d098cc72a88c797d01c7dff0c1350f315f05f",
      "tree": "09649a3bad715a7881d8e64ade1493a07c9df1d9",
      "parents": [
        "489d60ec36c3927c9ee0bc14a44c1c77b74c09f6"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Sun May 31 19:13:00 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Sun May 31 19:13:00 2009 -0700"
      },
      "message": "get rid of utils.h\n"
    },
    {
      "commit": "0b4a2fb7ce6961e27a3cf082297277a53ef2d524",
      "tree": "9f07ac96b798cb21cd1edc5ac60db2d360d856d8",
      "parents": [
        "794aaef95e1afa06b68a93c9fe9c881cf438c76a",
        "489d60ec36c3927c9ee0bc14a44c1c77b74c09f6"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Wed May 27 14:34:50 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Wed May 27 14:34:50 2009 -0700"
      },
      "message": "Merge commit \u0027goog/master\u0027 into merge_master\n\nConflicts:\n\tinclude/ui/Rect.h\n\tlibs/ui/ISurfaceComposer.cpp\n"
    },
    {
      "commit": "489d60ec36c3927c9ee0bc14a44c1c77b74c09f6",
      "tree": "cd777f51e68111af12a44dcd6001b28947a7e7dc",
      "parents": [
        "b7056fc8525e0515c6f46676e3307088f8b64cdc",
        "172fb9ab347e146642234f0bd6f223d351e9fd0b"
      ],
      "author": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 26 16:25:36 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue May 26 16:25:36 2009 -0700"
      },
      "message": "am f3288f17: Merge change 2468 into donut\n\nMerge commit \u0027f3288f178ae2b2c7910b234f54f43475a83eb860\u0027\n\n* commit \u0027f3288f178ae2b2c7910b234f54f43475a83eb860\u0027:\n  setVolume did not check interface descriptor\n"
    },
    {
      "commit": "b7056fc8525e0515c6f46676e3307088f8b64cdc",
      "tree": "d29743e9a55aa4f77fa25018e6248b459434bbbe",
      "parents": [
        "95634c8b6ad5419e310a5196bcc37f5988ed82da"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Fri May 22 19:00:22 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Tue May 26 16:12:20 2009 -0700"
      },
      "message": "some work to try to reduce the code size of some native libraries\n\n- make sure that all binder Bn classes define a ctor and dtor in their respective library.\n  This avoids duplication of the ctor/dtor in libraries where these objects are instantiated.\n  This is also cleaner, should we want these ctor/dtor to do something one day.\n\n- same change as above for some Bp classes and various other non-binder classes\n\n- moved the definition of CHECK_INTERFACE() in IInterface.h instead of having it everywhere.\n\n- improved the CHECK_INTERFACE() macro so it calls a single method in Parcel, instead of inlining its code everywhere\n\n- IBinder::getInterfaceDescriptor() now returns a \"const String16\u0026\" instead of String16, which saves calls to String16 and ~String16\n\n- implemented a cache for BpBinder::getInterfaceDescriptor(), since this does an IPC. HOWEVER, this method never seems to be called.\n  The cache makes BpBinder bigger, so we need to figure out if we need this method at all.\n"
    },
    {
      "commit": "172fb9ab347e146642234f0bd6f223d351e9fd0b",
      "tree": "faefb31f15b77dc35f6043a6535317d92a12bc17",
      "parents": [
        "f5879c1448cc6aebc51b26d3ec2399d66144f8f4"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "davidsparks@android.com",
        "time": "Tue May 26 14:39:29 2009 -0700"
      },
      "committer": {
        "name": "Dave Sparks",
        "email": "davidsparks@android.com",
        "time": "Tue May 26 14:39:29 2009 -0700"
      },
      "message": "setVolume did not check interface descriptor\nDO NOT MERGE\n"
    },
    {
      "commit": "95634c8b6ad5419e310a5196bcc37f5988ed82da",
      "tree": "ea712e322c480a83965f8f51946eda3263bdd080",
      "parents": [
        "0058db5fae0fecf66ee47aa1c35ddd6e11b6c66f",
        "f5879c1448cc6aebc51b26d3ec2399d66144f8f4"
      ],
      "author": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 26 10:11:44 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue May 26 10:11:44 2009 -0700"
      },
      "message": "am de8268d6: Merge change 2331 into donut\n\nMerge commit \u0027de8268d6d1cd168510c490b17e93154d2eab767c\u0027\n\n* commit \u0027de8268d6d1cd168510c490b17e93154d2eab767c\u0027:\n  Fix issue 1846343 - part 1\n"
    },
    {
      "commit": "f5879c1448cc6aebc51b26d3ec2399d66144f8f4",
      "tree": "d5ef576af674468ebff2b7d39c60ca0c9a53a39e",
      "parents": [
        "260b80b02d35a29c7010b10e5bea504164441665"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri May 22 09:18:15 2009 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue May 26 07:44:28 2009 -0700"
      },
      "message": "Fix issue 1846343 - part 1\n\nThis change is the first part of a fix for issue 1846343, :\n- Added new enum values for input sources in AudioRecord and MediaRecorder for voice uplink, downlink and uplink+downlink sources.\n- renamed streamType to inputSource in all native functions handling audio record.\n\nA second change is required in opencore author driver and android audio input to completely fix the issue.\n"
    },
    {
      "commit": "794aaef95e1afa06b68a93c9fe9c881cf438c76a",
      "tree": "bbfcb678a832f347f6f4fe8398c40c744f4ed0b9",
      "parents": [
        "cde489a26a200a21bcd6a3936435ec29dc389c42",
        "0058db5fae0fecf66ee47aa1c35ddd6e11b6c66f"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Fri May 22 01:27:01 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Fri May 22 02:16:08 2009 -0700"
      },
      "message": "merge master to master_gl\n"
    },
    {
      "commit": "0058db5fae0fecf66ee47aa1c35ddd6e11b6c66f",
      "tree": "b07791052009a5ae3502317f85d8d8748016749a",
      "parents": [
        "41d23d53e34eaa3c4928ec4a1c7d4a968c3c596e",
        "260b80b02d35a29c7010b10e5bea504164441665"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "nobody@android.com",
        "time": "Thu May 21 11:59:40 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu May 21 11:59:40 2009 -0700"
      },
      "message": "am f84d654c: am 4d8adefd: AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder.   When we moved the media recorder to the media server process, we lost   the permission check that was done at the process boundary in the   AudioRecord binder interface because the AudioRecord object is created   in the same process. This change adds a permission check in the   MediaRecorderClient:setAudioSource() method.   BUG\u003d1868334\n\nMerge commit \u0027f84d654cf9cf7ce3694ebb6913d78edd868d49fb\u0027\n\n* commit \u0027f84d654cf9cf7ce3694ebb6913d78edd868d49fb\u0027:\n  AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder.\n"
    },
    {
      "commit": "260b80b02d35a29c7010b10e5bea504164441665",
      "tree": "8c713bbfd2362bec94aba95c4a0dee8576096351",
      "parents": [
        "44722c6dc80b0bc3710f6a7fea31440988e8e3b6",
        "83a1a84c4c50c1003edafe07ba018bb5438f7b8f"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "nobody@android.com",
        "time": "Thu May 21 11:57:52 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu May 21 11:57:52 2009 -0700"
      },
      "message": "am 4d8adefd: AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder.   When we moved the media recorder to the media server process, we lost   the permission check that was done at the process boundary in the   AudioRecord binder interface because the AudioRecord object is created   in the same process. This change adds a permission check in the   MediaRecorderClient:setAudioSource() method.   BUG\u003d1868334\n\nMerge commit \u00274d8adefd35efdea849611b8b02d61f9517e47760\u0027 into donut\n\n* commit \u00274d8adefd35efdea849611b8b02d61f9517e47760\u0027:\n  AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder.\n"
    },
    {
      "commit": "83a1a84c4c50c1003edafe07ba018bb5438f7b8f",
      "tree": "b8282d35adb222621fd2f8a26f86b8a870b161ce",
      "parents": [
        "15c7247e27ac1a59053856297aef69a0cf049458"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "nobody@android.com",
        "time": "Thu May 21 10:02:21 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu May 21 10:02:21 2009 -0700"
      },
      "message": "AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder.\n  When we moved the media recorder to the media server process, we lost\n  the permission check that was done at the process boundary in the\n  AudioRecord binder interface because the AudioRecord object is created\n  in the same process. This change adds a permission check in the\n  MediaRecorderClient:setAudioSource() method.\n  BUG\u003d1868334\n\nAutomated import of CL 149136\n"
    },
    {
      "commit": "41d23d53e34eaa3c4928ec4a1c7d4a968c3c596e",
      "tree": "b07791052009a5ae3502317f85d8d8748016749a",
      "parents": [
        "7562408b2261d38415453378b6188f74fda99d88",
        "44722c6dc80b0bc3710f6a7fea31440988e8e3b6"
      ],
      "author": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 20 22:44:17 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed May 20 22:44:17 2009 -0700"
      },
      "message": "am c1c82509: Merge change 2163 into donut\n\nMerge commit \u0027c1c82509fb78403a969040cf057a66cbe3bfa538\u0027\n\n* commit \u0027c1c82509fb78403a969040cf057a66cbe3bfa538\u0027:\n  Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder\n"
    },
    {
      "commit": "44722c6dc80b0bc3710f6a7fea31440988e8e3b6",
      "tree": "8c713bbfd2362bec94aba95c4a0dee8576096351",
      "parents": [
        "3f52b1961f7a7185b204cacba836b8feb1215468",
        "510d6566bd2494991fac07aee46fcb2ddac99c13"
      ],
      "author": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 20 19:57:12 2009 -0700"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 20 19:57:12 2009 -0700"
      },
      "message": "Merge change 2163 into donut\n\n* changes:\n  Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder implementation to the mediaserver process. The permission check was previously enforced only at the AudioRecord binder interface for clients not in the same process. This change adds an additional check when the client tries to set the audio source. Bug 1868334\n"
    },
    {
      "commit": "510d6566bd2494991fac07aee46fcb2ddac99c13",
      "tree": "8c713bbfd2362bec94aba95c4a0dee8576096351",
      "parents": [
        "4afdfa7fd7e9fe59fb298ef2ac252686e68bc73a"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "davidsparks@android.com",
        "time": "Wed May 20 19:20:31 2009 -0700"
      },
      "committer": {
        "name": "Dave Sparks",
        "email": "davidsparks@android.com",
        "time": "Wed May 20 19:20:31 2009 -0700"
      },
      "message": "Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder\nimplementation to the mediaserver process. The permission check was previously\nenforced only at the AudioRecord binder interface for clients not in the same\nprocess. This change adds an additional check when the client tries to set\nthe audio source.\nBug 1868334\n"
    },
    {
      "commit": "7562408b2261d38415453378b6188f74fda99d88",
      "tree": "6b2ac284c1b721385d695045357d9e1d60ece03a",
      "parents": [
        "615a9bfbd98b90e09d868c128db84836feb658e4"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Tue May 19 19:08:10 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Wed May 20 12:55:03 2009 -0700"
      },
      "message": "move libbinder\u0027s header files under includes/binder\n"
    },
    {
      "commit": "615a9bfbd98b90e09d868c128db84836feb658e4",
      "tree": "8820d731b046206d781bb302cc79d7303c44dbbb",
      "parents": [
        "8bae84582c2836a605d3ec3382a5e2f0b233ca52"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Mon May 18 15:08:03 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Wed May 20 12:55:02 2009 -0700"
      },
      "message": "checkpoint: split libutils into libutils + libbinder\n"
    },
    {
      "commit": "8bae84582c2836a605d3ec3382a5e2f0b233ca52",
      "tree": "fc13e8547ac0f13cf2f3c220b738a23033bbf32b",
      "parents": [
        "94787a73363a3fea461443389a6cbb05858923e0",
        "3f52b1961f7a7185b204cacba836b8feb1215468"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed May 20 11:49:58 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed May 20 11:49:58 2009 -0700"
      },
      "message": "am d3f14a62: reconcile donut snapshot\n\nMerge commit \u0027d3f14a625e74a93e52b8b9aa5363a5de50129ea9\u0027\n\n* commit \u0027d3f14a625e74a93e52b8b9aa5363a5de50129ea9\u0027:\n  donut snapshot\n"
    },
    {
      "commit": "3f52b1961f7a7185b204cacba836b8feb1215468",
      "tree": "567634d378a3f3d729da960eea1b228f412a7ad2",
      "parents": [
        "4afdfa7fd7e9fe59fb298ef2ac252686e68bc73a",
        "b206b934737c73b2ad243ebcad53f110d464819e"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed May 20 11:28:11 2009 -0700"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed May 20 11:28:11 2009 -0700"
      },
      "message": "reconcile donut snapshot\n\nMerge branch \u0027donut-snapshot\u0027 into HEAD\n"
    },
    {
      "commit": "b206b934737c73b2ad243ebcad53f110d464819e",
      "tree": "567634d378a3f3d729da960eea1b228f412a7ad2",
      "parents": [
        "15c7247e27ac1a59053856297aef69a0cf049458"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed May 20 11:28:04 2009 -0700"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed May 20 11:28:04 2009 -0700"
      },
      "message": "donut snapshot\n"
    },
    {
      "commit": "cde489a26a200a21bcd6a3936435ec29dc389c42",
      "tree": "3db3cf848074cf4a3d1015641a1a05de24a1fd03",
      "parents": [
        "f21de663eec5552ce88add84c43d6896f7be564c"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Mon May 11 00:03:41 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Sun May 17 23:34:16 2009 -0700"
      },
      "message": "Region now has its own implementation instead of relying on SkRegion, which allows us to break libui\u0027s dependency on libcorecg.\n"
    },
    {
      "commit": "f21de663eec5552ce88add84c43d6896f7be564c",
      "tree": "0153b9a7fbca8d913e736e0ab33760c4f87c27b9",
      "parents": [
        "376f5614699f088aa458addfdc26fca4c4c63d68",
        "94787a73363a3fea461443389a6cbb05858923e0"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Thu May 07 17:46:45 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Thu May 07 17:46:45 2009 -0700"
      },
      "message": "Merge commit \u0027goog/master\u0027 into merge_master\n"
    },
    {
      "commit": "94787a73363a3fea461443389a6cbb05858923e0",
      "tree": "fc13e8547ac0f13cf2f3c220b738a23033bbf32b",
      "parents": [
        "d92b6abe662857ac729a9e31576c8fd17e4d725a",
        "4afdfa7fd7e9fe59fb298ef2ac252686e68bc73a"
      ],
      "author": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu May 07 11:54:50 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu May 07 11:54:50 2009 -0700"
      },
      "message": "am b85c374: Merge change 1155 into donut\n\nMerge commit \u0027b85c37432b3836fd30c81191425d7e00dcf2082c\u0027\n\n* commit \u0027b85c37432b3836fd30c81191425d7e00dcf2082c\u0027:\n  Don\u0027t allow negative numbers in ToneGenerator toneType parameter\n"
    },
    {
      "commit": "4afdfa7fd7e9fe59fb298ef2ac252686e68bc73a",
      "tree": "567634d378a3f3d729da960eea1b228f412a7ad2",
      "parents": [
        "0b62e242d112d46e9357242b0a4e11c720c98ca0"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "davidsparks@android.com",
        "time": "Thu May 07 09:26:06 2009 -0700"
      },
      "committer": {
        "name": "Dave Sparks",
        "email": "davidsparks@android.com",
        "time": "Thu May 07 09:26:06 2009 -0700"
      },
      "message": "Don\u0027t allow negative numbers in ToneGenerator toneType parameter\nBug 1836596\n"
    },
    {
      "commit": "d92b6abe662857ac729a9e31576c8fd17e4d725a",
      "tree": "f0e5c7c11324a09e68e8d626094bfd7e382063de",
      "parents": [
        "5c2634b99339eb3b8a2d2c17064774c3c4586651",
        "0b62e242d112d46e9357242b0a4e11c720c98ca0"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed May 06 15:48:33 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed May 06 15:48:33 2009 -0700"
      },
      "message": "manual merge f3af740bdfc261b1cb25c0799af780d3753d4518\n\nMerge commit \u0027f3af740bdfc261b1cb25c0799af780d3753d4518\u0027\n"
    },
    {
      "commit": "0b62e242d112d46e9357242b0a4e11c720c98ca0",
      "tree": "6f85343724e3daca261f9c9da07925a035a08fd0",
      "parents": [
        "65e5f79102e39cb2e9ab71ced0b62347bf1512a5"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue May 05 00:49:01 2009 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed May 06 11:35:46 2009 -0700"
      },
      "message": "Fixed issue 1709450: Requirements for CDMA Tone Generator\n\nAdded new tone types for CDMA IS-95 specific tones.\nAutomatic selection between IS-95, CEPT and JAPAN version base on operator\ncountry code for call supervisory tones.\nAlso improved tone generator capabilities:\n- Each tone segment can now generate its own set of frequencies\n- A tone does not have to be a succession of alternating ON/OFF segments\n- The sequence repetition does not have to start from first segment\n"
    },
    {
      "commit": "376f5614699f088aa458addfdc26fca4c4c63d68",
      "tree": "55b00dd1ec48d67aa6ac5aa92a58618cd1389f2b",
      "parents": [
        "81dd9e9f10b3557e8f1b13a5b1466bdcd74e0b56"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Tue May 05 18:21:32 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Tue May 05 18:21:32 2009 -0700"
      },
      "message": "move android_native_buffer_t declaration into its own private/ui/android_native_priv.h header, since user code should never have access to it.\n"
    },
    {
      "commit": "81dd9e9f10b3557e8f1b13a5b1466bdcd74e0b56",
      "tree": "eab94397cc62c5d5dd940d619fa1290159545d38",
      "parents": [
        "2af30c2b584e931bf444d7daed43a01d6a585df6"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Tue May 05 18:11:11 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Tue May 05 18:11:11 2009 -0700"
      },
      "message": "move opengl/include/EGL/android_natives.h to include/ui/egl/android_natives.h and don\u0027t include it from egl.h\n\nthe android_native_ types are just forward declared in egl.h\n"
    },
    {
      "commit": "5c2634b99339eb3b8a2d2c17064774c3c4586651",
      "tree": "2997ed550f85db9435caf51e85c658d793dd39be",
      "parents": [
        "eac4d8216b8e26ca18b4c56f105f68595e5c410f",
        "65e5f79102e39cb2e9ab71ced0b62347bf1512a5"
      ],
      "author": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 01 14:09:13 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri May 01 14:09:13 2009 -0700"
      },
      "message": "am e117ff6: Merge change 860 into donut\n\nMerge commit \u0027e117ff6e29df64b5945a4a242434f62abd117a9b\u0027\n\n* commit \u0027e117ff6e29df64b5945a4a242434f62abd117a9b\u0027:\n  Change 79 in git master branch\n"
    },
    {
      "commit": "65e5f79102e39cb2e9ab71ced0b62347bf1512a5",
      "tree": "567eda5ee18a36fc2bf9f67e8015e90013410997",
      "parents": [
        "124b5234a5110fb14d2114062c04d598cca76dd4"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Thu Apr 30 23:42:56 2009 -0700"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Thu Apr 30 23:42:56 2009 -0700"
      },
      "message": "Change 79 in git master branch\n"
    },
    {
      "commit": "2af30c2b584e931bf444d7daed43a01d6a585df6",
      "tree": "f3f49f7a9b018078cc765642abc215dea8a8aaf8",
      "parents": [
        "4fde27f0b89b3df5e280b648dd6c7968ee864916",
        "eac4d8216b8e26ca18b4c56f105f68595e5c410f"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Thu Apr 30 14:43:18 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Thu Apr 30 14:43:18 2009 -0700"
      },
      "message": "Merge commit \u0027goog/master\u0027 into merge_master\n\nConflicts:\n\tlibs/surfaceflinger/Layer.cpp\n\tlibs/surfaceflinger/SurfaceFlinger.cpp\n\topengl/libagl/egl.cpp\n\topengl/libs/EGL/egl.cpp\n\topengl/libs/GLES_CM/gl.cpp\n\topengl/libs/GLES_CM/gl_api.in\n\topengl/libs/gl_entries.in\n\topengl/libs/tools/glapigen\n"
    },
    {
      "commit": "eac4d8216b8e26ca18b4c56f105f68595e5c410f",
      "tree": "2997ed550f85db9435caf51e85c658d793dd39be",
      "parents": [
        "8a6234e743862d5f9570c518b967892899799146",
        "124b5234a5110fb14d2114062c04d598cca76dd4"
      ],
      "author": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Apr 29 15:43:34 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Apr 29 15:43:34 2009 -0700"
      },
      "message": "am 7fe3b06: Merge change 740 into donut\n\nMerge commit \u00277fe3b064d3645fcebd09b162c5989e0d702112e2\u0027\n\n* commit \u00277fe3b064d3645fcebd09b162c5989e0d702112e2\u0027:\n  MIDI render thread was nice 0, should be nice -16.\n"
    },
    {
      "commit": "124b5234a5110fb14d2114062c04d598cca76dd4",
      "tree": "763696b02809820f57e06a458eb7b655f6aa4f11",
      "parents": [
        "08d949a37fc1d0a7b501a85d4d442975325de093",
        "577ba8a1ae29cd2ca3b6103ae51530111d3e9b22"
      ],
      "author": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Apr 29 15:27:15 2009 -0700"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Apr 29 15:27:15 2009 -0700"
      },
      "message": "Merge change 740 into donut\n\n* changes:\n  MIDI render thread was nice 0, should be nice -16. Seems like a recent change sets the thread priority to 0. Previously it inherited priority from the parent thread. This change sets the MIDI render thread priority to the default for audio threads. Reference bug 1800905\n"
    },
    {
      "commit": "8a6234e743862d5f9570c518b967892899799146",
      "tree": "689403c0505a3f3046de90b25d6c27849e9fdb27",
      "parents": [
        "8b398c3b6095bb35380660b12cc6ec274dc8aa80",
        "08d949a37fc1d0a7b501a85d4d442975325de093"
      ],
      "author": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Apr 29 13:41:22 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Apr 29 13:41:22 2009 -0700"
      },
      "message": "am 9f98f79: Merge change 739 into donut\n\nMerge commit \u00279f98f79f8eb41889dec36e0a76aaf0414b39bb3a\u0027\n\n* commit \u00279f98f79f8eb41889dec36e0a76aaf0414b39bb3a\u0027:\n  Vorbis render thread was nice 0, should be nice -16.\n"
    },
    {
      "commit": "577ba8a1ae29cd2ca3b6103ae51530111d3e9b22",
      "tree": "d14986a887c1f5e7f082e376cbe7e9e98b0cb612",
      "parents": [
        "ff874ab4b3c7b153a9a9cbb17ecf610b4ebe1127"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "davidsparks@android.com",
        "time": "Wed Apr 29 12:59:33 2009 -0700"
      },
      "committer": {
        "name": "Dave Sparks",
        "email": "davidsparks@android.com",
        "time": "Wed Apr 29 12:59:33 2009 -0700"
      },
      "message": "MIDI render thread was nice 0, should be nice -16.\nSeems like a recent change sets the thread priority to 0. Previously it\ninherited priority from the parent thread. This change sets the MIDI\nrender thread priority to the default for audio threads.\nReference bug 1800905\n"
    },
    {
      "commit": "08d949a37fc1d0a7b501a85d4d442975325de093",
      "tree": "eeb44209378fe4c01b53811b2105ea6ae8e3f1fa",
      "parents": [
        "ff874ab4b3c7b153a9a9cbb17ecf610b4ebe1127"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "davidsparks@android.com",
        "time": "Wed Apr 29 12:42:28 2009 -0700"
      },
      "committer": {
        "name": "Dave Sparks",
        "email": "davidsparks@android.com",
        "time": "Wed Apr 29 12:42:28 2009 -0700"
      },
      "message": "Vorbis render thread was nice 0, should be nice -16.\nSeems like a recent change sets the thread priority to 0. Previously it\ninherited priority from the parent thread. This change sets the Vorbis\nrender thread priority to the default for audio threads.\nReference bug 1800905\n"
    },
    {
      "commit": "4fde27f0b89b3df5e280b648dd6c7968ee864916",
      "tree": "5b434dc7de5bd66d36e54d69df486dc758e34f92",
      "parents": [
        "a4495e15248ff9a7024fd2e0a528b3aa8ca46155"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Mon Apr 20 19:39:12 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Fri Apr 24 16:22:36 2009 -0700"
      },
      "message": "a brand new MessageQueue for SurfaceFlinger.\n"
    },
    {
      "commit": "a4495e15248ff9a7024fd2e0a528b3aa8ca46155",
      "tree": "0b938774dcbd9c834ec2a83f85166aa9eb7b0152",
      "parents": [
        "98544b0343ba225935099e3957de2b5a42779a06",
        "8b398c3b6095bb35380660b12cc6ec274dc8aa80"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Fri Apr 24 14:24:20 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Fri Apr 24 14:24:20 2009 -0700"
      },
      "message": "Merge commit \u0027goog/master\u0027 into merge_master\n"
    },
    {
      "commit": "8b398c3b6095bb35380660b12cc6ec274dc8aa80",
      "tree": "e96bb568fcb59d31b2db9dae94bf9a9ba582f44d",
      "parents": [
        "45bce6ef3972adf17ad7e2e41f7ceb2b6889cf85",
        "ff874ab4b3c7b153a9a9cbb17ecf610b4ebe1127"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Apr 22 18:33:17 2009 -0700"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Apr 22 18:33:17 2009 -0700"
      },
      "message": "Merge donut into master\n"
    },
    {
      "commit": "ff874ab4b3c7b153a9a9cbb17ecf610b4ebe1127",
      "tree": "a2704fd75e6de04107a7d40bd3e56f6f7acfa51b",
      "parents": [
        "1dd70b9f04961a06fcb73a97fca10a53b3245d3c",
        "15c7247e27ac1a59053856297aef69a0cf049458"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Apr 22 17:56:58 2009 -0700"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Apr 22 17:56:58 2009 -0700"
      },
      "message": "merge cupcake into donut\n"
    },
    {
      "commit": "45bce6ef3972adf17ad7e2e41f7ceb2b6889cf85",
      "tree": "e96bb568fcb59d31b2db9dae94bf9a9ba582f44d",
      "parents": [
        "84c18d6459635099d52b63009ef5a007891c4fb6",
        "1dd70b9f04961a06fcb73a97fca10a53b3245d3c"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Apr 22 17:12:34 2009 -0700"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Apr 22 17:12:34 2009 -0700"
      },
      "message": "Merge donut into master\n"
    },
    {
      "commit": "1dd70b9f04961a06fcb73a97fca10a53b3245d3c",
      "tree": "a2704fd75e6de04107a7d40bd3e56f6f7acfa51b",
      "parents": [
        "ce80c82f58378da72d8a36f520c781cc5cac18a1"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Apr 21 07:56:33 2009 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Apr 21 07:56:33 2009 -0700"
      },
      "message": "Fix issue 1745312: Various cleanups in media framework\n\nAudioTrack, AudioRecord:\n  - remove useless mAudioFlinger member of AudioTrack and AudioRecord.\n  - signal cblk.cv condition in stop() method to speed up stop completion.\n  - extend wait condition timeout in obtainBuffer() when waitCount is -1 to avoid waking up callback thread unnecessarily\n\nAudioFlinger:\n  - remove some warnings in AudioFlinger.cpp.\n  - remove function AudioFlinger::MixerThread::removetrack_l()  as its content is never executed.\n  - remove useless call to setMasterVolume in AudioFlinger::handleForcedSpeakerRoute().\n  - Offset VOICE_CALL stream volume to reflect actual volume that is never 0 in hardware (this fix has been made in the open source): 0.01 + v * 0.99.\n\nAudioSystem.java:\n  - correct typo in comment\n\nIAudioflinger, IAudioFlingerClient:\n  - make AudioFlinger binder interfaces used for callbacks ONEWAY.\n\nAudioHardwareInterface:\n  - correct routeStrings[] table in AudioHardwareInteface.cpp\n"
    },
    {
      "commit": "98544b0343ba225935099e3957de2b5a42779a06",
      "tree": "f83b3d531f58ebe0f6de738efb69797b11d28ea0",
      "parents": [
        "818984efef978f0215eb73724ef0d8873354ffd8",
        "84c18d6459635099d52b63009ef5a007891c4fb6"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Tue Apr 14 14:20:43 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Tue Apr 14 14:45:37 2009 -0700"
      },
      "message": "Merge commit \u0027goog/master\u0027 into merge_master\n"
    },
    {
      "commit": "84c18d6459635099d52b63009ef5a007891c4fb6",
      "tree": "9cb0b1d2da590ca665bd6cf7d548cf4d0af010d7",
      "parents": [
        "eb2d3074428defeaff8f2dd44c1f7bcc8d92faac"
      ],
      "author": {
        "name": "Jianhong Jiang",
        "email": "jianhong@google.com",
        "time": "Mon Apr 13 19:01:51 2009 -0700"
      },
      "committer": {
        "name": "Jianhong Jiang",
        "email": "jianhong@google.com",
        "time": "Mon Apr 13 19:01:51 2009 -0700"
      },
      "message": "Squashed commit of the following:\n\ncommit b6cf47306b642f7cf7e1b55cce448e0deff38f36\nAuthor: Jianhong Jiang \u003cjianhong@google.com\u003e\nDate:   Mon Apr 13 11:07:01 2009 -0700\n\n    Change tabs into 4 spaces.\n\ncommit 93c5890dbcc68e37aa0ef039b4a203acddca8968\nAuthor: Jianhong Jiang \u003cjianhong@google.com\u003e\nDate:   Fri Apr 10 14:15:23 2009 -0700\n\n    OpenCore 2.02 related changes.\n"
    },
    {
      "commit": "818984efef978f0215eb73724ef0d8873354ffd8",
      "tree": "ed37baeace2f3b100f4cb373a766b11686706f38",
      "parents": [
        "b1514c918da830ce959c84ccec553769f227304e",
        "eb2d3074428defeaff8f2dd44c1f7bcc8d92faac"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Fri Apr 10 14:36:33 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Fri Apr 10 14:36:33 2009 -0700"
      },
      "message": "Merge commit \u0027goog/master\u0027 into master_gl\n\nConflicts:\n\tlibs/utils/Parcel.cpp\n"
    },
    {
      "commit": "b1514c918da830ce959c84ccec553769f227304e",
      "tree": "0e0b0f51a15a5f6633575b80579059055fd11f92",
      "parents": [
        "48f7f5e8359909ddfc6492a79a8b9c44759ca6c3"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Fri Apr 10 14:24:30 2009 -0700"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Fri Apr 10 14:24:30 2009 -0700"
      },
      "message": "Integrate from //sandbox/mathias/donut/...@145728\n\nSurfaceFlinger rework for new EGL driver model support.\n"
    },
    {
      "commit": "eb2d3074428defeaff8f2dd44c1f7bcc8d92faac",
      "tree": "744972581a1bf8c8068c2de53397f3564f10de66",
      "parents": [
        "0adb1685383aef4b2c9158544a22ae40fcc79ffa"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Apr 08 14:40:56 2009 -0700"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Apr 08 14:40:56 2009 -0700"
      },
      "message": "Revert \"Enable OpenCORE on master - part 1\"\n\nThis reverts commit 9f1455fcc2ca8ad5e33b32b8a55c231944f4ff99.\n"
    },
    {
      "commit": "0adb1685383aef4b2c9158544a22ae40fcc79ffa",
      "tree": "04aca09d30a4b4d9bc352926a96b6318d466ba76",
      "parents": [
        "0df2c0386c09da9e8465afe31e4721654bb840a1"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Apr 08 14:40:48 2009 -0700"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Apr 08 14:40:48 2009 -0700"
      },
      "message": "Revert \"Changes required to accommodate OpenCORE 2.0\"\n\nThis reverts commit ea780b689f8ee3dff355deab2434bbd4ae04d208.\n\nConflicts:\n\n\tmedia/libmediaplayerservice/Android.mk\n"
    },
    {
      "commit": "0df2c0386c09da9e8465afe31e4721654bb840a1",
      "tree": "a7c51d60c825f1354dd69e8e4acbf584a6462ba0",
      "parents": [
        "96020d9bcfdc228d33fc14e281bf6f416de4bdb8",
        "48f7f5e8359909ddfc6492a79a8b9c44759ca6c3"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "",
        "time": "Thu Apr 02 09:33:55 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Apr 02 09:33:55 2009 -0700"
      },
      "message": "Merge branch \u0027readonly-p4-master\u0027\n"
    },
    {
      "commit": "48f7f5e8359909ddfc6492a79a8b9c44759ca6c3",
      "tree": "fb57dec51bcb78959e95b6e48b6eb610b07a32a8",
      "parents": [
        "d1d35e0359cc411b04615813ba4ebefbb33d1933"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "",
        "time": "Thu Apr 02 09:32:43 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Apr 02 09:32:43 2009 -0700"
      },
      "message": "AI 144097: am: CL 144054 am: CL 144053 Fix issue #1751242 A2DP playback fails first time: Invalid buffer size: minFrameCount 10240, frameCount 4800\n  The problem comes from the fact that AudioSystem::getOutputFrameCount() calls getOutput() to retrieve the active output (A2DP or Hardware) before calling get_audio_flinger(). If it is the first time AudioSystem::getOutputFrameCount() is called in a given process, getOutput() will return a wrong value because gA2dpEnabled has not yet been updated by get_audio_flinger().\n  The fix consists in calling get_audio_flinger() in getOutput() to be sure that gA2dpEnabled is valid when getOutput() reads it.\n  Original author: elaurent\n  Merged from: //branches/cupcake/...\n  Original author: android-build\n  Merged from: //branches/donutburger/...\n\nAutomated import of CL 144097\n"
    },
    {
      "commit": "ce80c82f58378da72d8a36f520c781cc5cac18a1",
      "tree": "fb57dec51bcb78959e95b6e48b6eb610b07a32a8",
      "parents": [
        "8f7f2dcd8b975657e3c33befdaed48fc2966ce34"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "",
        "time": "Wed Apr 01 12:55:13 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Apr 01 12:55:13 2009 -0700"
      },
      "message": "AI 144054: am: CL 144053 Fix issue #1751242 A2DP playback fails first time: Invalid buffer size: minFrameCount 10240, frameCount 4800\n  The problem comes from the fact that AudioSystem::getOutputFrameCount() calls getOutput() to retrieve the active output (A2DP or Hardware) before calling get_audio_flinger(). If it is the first time AudioSystem::getOutputFrameCount() is called in a given process, getOutput() will return a wrong value because gA2dpEnabled has not yet been updated by get_audio_flinger().\n  The fix consists in calling get_audio_flinger() in getOutput() to be sure that gA2dpEnabled is valid when getOutput() reads it.\n  Original author: elaurent\n  Merged from: //branches/cupcake/...\n\nAutomated import of CL 144054\n"
    },
    {
      "commit": "15c7247e27ac1a59053856297aef69a0cf049458",
      "tree": "fb57dec51bcb78959e95b6e48b6eb610b07a32a8",
      "parents": [
        "3f6fc880d92081fdec1351d219093dc0f7bbfcdd"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "",
        "time": "Wed Apr 01 12:54:49 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Apr 01 12:54:49 2009 -0700"
      },
      "message": "AI 144053: Fix issue #1751242 A2DP playback fails first time: Invalid buffer size: minFrameCount 10240, frameCount 4800\n  The problem comes from the fact that AudioSystem::getOutputFrameCount() calls getOutput() to retrieve the active output (A2DP or Hardware) before calling get_audio_flinger(). If it is the first time AudioSystem::getOutputFrameCount() is called in a given process, getOutput() will return a wrong value because gA2dpEnabled has not yet been updated by get_audio_flinger().\n  The fix consists in calling get_audio_flinger() in getOutput() to be sure that gA2dpEnabled is valid when getOutput() reads it.\n  BUG\u003d1751242\n\nAutomated import of CL 144053\n"
    },
    {
      "commit": "96020d9bcfdc228d33fc14e281bf6f416de4bdb8",
      "tree": "3b659d40f3b0b17e7b4ab91a26e23efed3cd6e4c",
      "parents": [
        "74bc4f65a75e812835d1091f987977730f713657",
        "1503b07c2619dc520b0b6747f645cebe10cc05a3"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 31 22:19:39 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 31 22:19:39 2009 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of git://android.git.kernel.org/platform/frameworks/base\n"
    },
    {
      "commit": "1503b07c2619dc520b0b6747f645cebe10cc05a3",
      "tree": "e0672b6b1b68cb353bf2403fc7622fac768d2c79",
      "parents": [
        "c918d4ae9d45f3d7d0150e35eae8cd97ec474118"
      ],
      "author": {
        "name": "Ravi K Yenduri",
        "email": "yenduri@pv.com",
        "time": "Tue Mar 31 10:26:41 2009 -0700"
      },
      "committer": {
        "name": "Ravi K Yenduri",
        "email": "yenduri@pv.com",
        "time": "Tue Mar 31 10:26:41 2009 -0700"
      },
      "message": "Enable OpenCORE on master - part 1\n"
    },
    {
      "commit": "74bc4f65a75e812835d1091f987977730f713657",
      "tree": "e35fe2580a964abdb34c80bfe3a07815431c83dd",
      "parents": [
        "d1d35e0359cc411b04615813ba4ebefbb33d1933",
        "5580d1f0e9eb01fbfb81f2270f2caaa5ae3b47ed"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Sun Mar 29 08:55:27 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Sun Mar 29 08:55:27 2009 -0700"
      },
      "message": "Merge branch \u0027open_source\u0027 into google_internal\n\nConflicts:\n\tcore/java/android/widget/TwoLineListItem.java\n\tcore/res/res/values/public.xml\n\tpreloaded-classes\n"
    },
    {
      "commit": "8f7f2dcd8b975657e3c33befdaed48fc2966ce34",
      "tree": "a1ebb6af385b046d58b36f57e588a344099d745e",
      "parents": [
        "a845f672e491ec3567709501f8af8d3661f184e7"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "",
        "time": "Fri Mar 27 20:28:22 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Mar 27 20:28:22 2009 -0700"
      },
      "message": "AI 143267: am: CL 143127 Media recorder service requires android.permission.CAMERA to record video\n  Original author: davidsparks\n  Merged from: //branches/cupcake/...\n\nAutomated import of CL 143267\n"
    },
    {
      "commit": "d1d35e0359cc411b04615813ba4ebefbb33d1933",
      "tree": "a1ebb6af385b046d58b36f57e588a344099d745e",
      "parents": [
        "29a65006e517ae5bb164e973b2d805ebfa834a2e"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "",
        "time": "Fri Mar 27 19:56:11 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Mar 27 19:56:11 2009 -0700"
      },
      "message": "AI 143396: am: CL 143267 am: CL 143127 Media recorder service requires android.permission.CAMERA to record video\n  Original author: davidsparks\n  Merged from: //branches/cupcake/...\n  Original author: android-build\n  Merged from: //branches/donutburger/...\n\nAutomated import of CL 143396\n"
    },
    {
      "commit": "5580d1f0e9eb01fbfb81f2270f2caaa5ae3b47ed",
      "tree": "e35fe2580a964abdb34c80bfe3a07815431c83dd",
      "parents": [
        "c918d4ae9d45f3d7d0150e35eae8cd97ec474118",
        "3f6fc880d92081fdec1351d219093dc0f7bbfcdd"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Mar 27 18:48:32 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Mar 27 18:48:32 2009 -0700"
      },
      "message": "Merge commit \u0027goog/cupcake\u0027\n"
    },
    {
      "commit": "29a65006e517ae5bb164e973b2d805ebfa834a2e",
      "tree": "252656d31faf4fc51988cb6345f7d5f51cfbf003",
      "parents": [
        "5b27b6f5b8073ad4363c89485f64b0ab3027b222"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "",
        "time": "Fri Mar 27 18:18:46 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Mar 27 18:18:46 2009 -0700"
      },
      "message": "AI 143327: am: CL 143177 am: CL 142889 Fix issue #1736153\tCamera shutter sound can be muted by new AlarmClock setting.\n  Current implementation of Camera service plays the camera shutter sound over the ALARM stream so that it cannot be muted by silent mode in order to comply to some country specific requirement. A recent change made it possible for the user to mute the ALARM stream thus making this stream not suitable any more for the camera shutter sound.\n  The fix consists in creating a new stream type only accessible by native code and that cannot be muted and use it to play camera sounds.\n  Original author: elaurent\n  Merged from: //branches/cupcake/...\n  Original author: android-build\n  Merged from: //branches/donutburger/...\n\nAutomated import of CL 143327\n"
    },
    {
      "commit": "a845f672e491ec3567709501f8af8d3661f184e7",
      "tree": "252656d31faf4fc51988cb6345f7d5f51cfbf003",
      "parents": [
        "cd6725a333395ffeac3215ea4bf834a95aaa8def"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "",
        "time": "Fri Mar 27 16:27:16 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Mar 27 16:27:16 2009 -0700"
      },
      "message": "AI 143177: am: CL 142889 Fix issue #1736153\tCamera shutter sound can be muted by new AlarmClock setting.\n  Current implementation of Camera service plays the camera shutter sound over the ALARM stream so that it cannot be muted by silent mode in order to comply to some country specific requirement. A recent change made it possible for the user to mute the ALARM stream thus making this stream not suitable any more for the camera shutter sound.\n  The fix consists in creating a new stream type only accessible by native code and that cannot be muted and use it to play camera sounds.\n  Original author: elaurent\n  Merged from: //branches/cupcake/...\n\nAutomated import of CL 143177\n"
    },
    {
      "commit": "c918d4ae9d45f3d7d0150e35eae8cd97ec474118",
      "tree": "3f5f364706a83704349be8c1bc26dbb214189ba2",
      "parents": [
        "6c5b21025f746fcb838499ae01b4d384ab1d2f66",
        "e47562d6b22a091c62ad0c7c2d68d0968b5d21af"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Mar 27 15:38:40 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Mar 27 15:38:40 2009 -0700"
      },
      "message": "Merge commit \u0027korg/cupcake\u0027\n\nConflicts:\n\tcore/java/android/webkit/WebView.java\n\tcore/java/android/widget/TwoLineListItem.java\n\tpreloaded-classes\n"
    },
    {
      "commit": "3f6fc880d92081fdec1351d219093dc0f7bbfcdd",
      "tree": "a1ebb6af385b046d58b36f57e588a344099d745e",
      "parents": [
        "e47562d6b22a091c62ad0c7c2d68d0968b5d21af"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "",
        "time": "Fri Mar 27 12:57:40 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Mar 27 12:57:40 2009 -0700"
      },
      "message": "AI 143127: Media recorder service requires android.permission.CAMERA to record video\n  BUG\u003d1742392\n\nAutomated import of CL 143127\n"
    },
    {
      "commit": "e47562d6b22a091c62ad0c7c2d68d0968b5d21af",
      "tree": "252656d31faf4fc51988cb6345f7d5f51cfbf003",
      "parents": [
        "7c8cfad419b7a6c38435e213ce54e180e296322e"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "",
        "time": "Thu Mar 26 01:57:59 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Mar 26 01:57:59 2009 -0700"
      },
      "message": "Automated import from //branches/cupcake/...@142889,142889\n"
    },
    {
      "commit": "5b27b6f5b8073ad4363c89485f64b0ab3027b222",
      "tree": "5b91684d034bdf44cbd297f04d2066e78190b119",
      "parents": [
        "5cb07aa071b43a214e4c880b3b7852714e06451b"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "",
        "time": "Tue Mar 24 21:29:21 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 21:29:21 2009 -0700"
      },
      "message": "Automated import from //branches/master/...@142066,142066\n"
    },
    {
      "commit": "cd6725a333395ffeac3215ea4bf834a95aaa8def",
      "tree": "5b91684d034bdf44cbd297f04d2066e78190b119",
      "parents": [
        "4003bf5e4cd948fe7732c16b2a683acdbfa8c44d"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "",
        "time": "Tue Mar 24 21:23:54 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 21:23:54 2009 -0700"
      },
      "message": "Automated import from //branches/donutburger/...@142065,142065\n"
    },
    {
      "commit": "5cb07aa071b43a214e4c880b3b7852714e06451b",
      "tree": "fd9df04a47016b0c46d32f2f608d45d5c5731a08",
      "parents": [
        "7f46607934437779720f1099e6b17f4db8c60ba1"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "",
        "time": "Tue Mar 24 20:48:51 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 20:48:51 2009 -0700"
      },
      "message": "Automated import from //branches/master/...@141712,141712\n"
    },
    {
      "commit": "4003bf5e4cd948fe7732c16b2a683acdbfa8c44d",
      "tree": "fd9df04a47016b0c46d32f2f608d45d5c5731a08",
      "parents": [
        "3c4b3e3f8927dd149df87bb98646497c7043d0ae"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "",
        "time": "Tue Mar 24 20:47:19 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 20:47:19 2009 -0700"
      },
      "message": "Automated import from //branches/donutburger/...@141711,141711\n"
    },
    {
      "commit": "7f46607934437779720f1099e6b17f4db8c60ba1",
      "tree": "8b2eeccab43d53de0f2245db3a844869fbea5f94",
      "parents": [
        "90ca92cc07596900932aba0dad07457e619ae3da"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "",
        "time": "Tue Mar 24 20:36:20 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 20:36:20 2009 -0700"
      },
      "message": "Automated import from //branches/master/...@141595,141595\n"
    },
    {
      "commit": "3c4b3e3f8927dd149df87bb98646497c7043d0ae",
      "tree": "8b2eeccab43d53de0f2245db3a844869fbea5f94",
      "parents": [
        "7d563247cdac0509009d579bbf849157d47c38a9"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "",
        "time": "Tue Mar 24 20:35:44 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 20:35:44 2009 -0700"
      },
      "message": "Automated import from //branches/donutburger/...@141593,141593\n"
    },
    {
      "commit": "7d563247cdac0509009d579bbf849157d47c38a9",
      "tree": "2a6b28c0a3b73ccb81dba2d78681a63b482c5542",
      "parents": [
        "158857d5a6bb93aa6a135a338f9b6389e0f2b3a5"
      ],
      "author": {
        "name": "Jean-Michel Trivi",
        "email": "",
        "time": "Tue Mar 24 19:48:58 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 19:48:58 2009 -0700"
      },
      "message": "Automated import from //branches/donutburger/...@141200,141200\n"
    },
    {
      "commit": "90ca92cc07596900932aba0dad07457e619ae3da",
      "tree": "2a6b28c0a3b73ccb81dba2d78681a63b482c5542",
      "parents": [
        "06aff807c612d1f3b38168d3abcc67bb19ec8d3d"
      ],
      "author": {
        "name": "Jean-Michel Trivi",
        "email": "",
        "time": "Tue Mar 24 19:48:32 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 19:48:32 2009 -0700"
      },
      "message": "Automated import from //branches/master/...@141201,141201\n"
    },
    {
      "commit": "7c8cfad419b7a6c38435e213ce54e180e296322e",
      "tree": "5b91684d034bdf44cbd297f04d2066e78190b119",
      "parents": [
        "8769ce31b4aa1c8342925e514314435c217b0d46"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "",
        "time": "Tue Mar 24 18:56:19 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 18:56:19 2009 -0700"
      },
      "message": "Automated import from //branches/cupcake/...@142064,142064\n"
    },
    {
      "commit": "06aff807c612d1f3b38168d3abcc67bb19ec8d3d",
      "tree": "194d8655f53a34ca1ccfd8eecb13128994095182",
      "parents": [
        "1af452f333664e8b0a61d96a9b3bb682d8b9a00f"
      ],
      "author": {
        "name": "Jean-Michel Trivi",
        "email": "",
        "time": "Tue Mar 24 18:46:20 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 18:46:20 2009 -0700"
      },
      "message": "Automated import from //branches/master/...@140869,140869\n"
    },
    {
      "commit": "158857d5a6bb93aa6a135a338f9b6389e0f2b3a5",
      "tree": "194d8655f53a34ca1ccfd8eecb13128994095182",
      "parents": [
        "7dc112527d77b675d5c0451502b33fe2c552a79e"
      ],
      "author": {
        "name": "Jean-Michel Trivi",
        "email": "",
        "time": "Tue Mar 24 18:46:07 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 18:46:07 2009 -0700"
      },
      "message": "Automated import from //branches/donutburger/...@140867,140867\n"
    },
    {
      "commit": "1af452f333664e8b0a61d96a9b3bb682d8b9a00f",
      "tree": "47fe626c09316b14f5faa3db3553d1b6330c2c67",
      "parents": [
        "859d22fb31792fd9c2c77fba9be3378774b2cfe9"
      ],
      "author": {
        "name": "Jason Sams",
        "email": "",
        "time": "Tue Mar 24 18:45:22 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 18:45:22 2009 -0700"
      },
      "message": "Automated import from //branches/master/...@140868,140868\n"
    },
    {
      "commit": "7dc112527d77b675d5c0451502b33fe2c552a79e",
      "tree": "47fe626c09316b14f5faa3db3553d1b6330c2c67",
      "parents": [
        "2c22aeb65e801f663a754d043062f85e49f77739"
      ],
      "author": {
        "name": "Jason Sams",
        "email": "",
        "time": "Tue Mar 24 18:45:20 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 18:45:20 2009 -0700"
      },
      "message": "Automated import from //branches/donutburger/...@140866,140866\n"
    },
    {
      "commit": "8769ce31b4aa1c8342925e514314435c217b0d46",
      "tree": "fd9df04a47016b0c46d32f2f608d45d5c5731a08",
      "parents": [
        "795fa5848276bab87445fa64fd0941c13ef62398"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "",
        "time": "Tue Mar 24 18:14:23 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 18:14:23 2009 -0700"
      },
      "message": "Automated import from //branches/cupcake/...@141708,141708\n"
    },
    {
      "commit": "859d22fb31792fd9c2c77fba9be3378774b2cfe9",
      "tree": "56016c49e2ce13a911a21b25cac543695e45aadc",
      "parents": [
        "1179bc9b0e3d17c984e8f4ad38561c049dd102fa"
      ],
      "author": {
        "name": "Jean-Michel Trivi",
        "email": "",
        "time": "Tue Mar 24 18:11:52 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 18:11:52 2009 -0700"
      },
      "message": "Automated import from //branches/master/...@140665,140665\n"
    },
    {
      "commit": "2c22aeb65e801f663a754d043062f85e49f77739",
      "tree": "56016c49e2ce13a911a21b25cac543695e45aadc",
      "parents": [
        "1179bc9b0e3d17c984e8f4ad38561c049dd102fa"
      ],
      "author": {
        "name": "Jean-Michel Trivi",
        "email": "",
        "time": "Tue Mar 24 18:11:07 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 18:11:07 2009 -0700"
      },
      "message": "Automated import from //branches/donutburger/...@140663,140663\n"
    },
    {
      "commit": "795fa5848276bab87445fa64fd0941c13ef62398",
      "tree": "8b2eeccab43d53de0f2245db3a844869fbea5f94",
      "parents": [
        "87e445b4bed2931b9033aff68878cd4b392e1fab"
      ],
      "author": {
        "name": "Dave Sparks",
        "email": "",
        "time": "Tue Mar 24 17:57:12 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 24 17:57:12 2009 -0700"
      },
      "message": "Automated import from //branches/cupcake/...@141591,141591\n"
    },
    {
      "commit": "6c5b21025f746fcb838499ae01b4d384ab1d2f66",
      "tree": "c6ace6199ce9135a0fa71eb8158f6d3d03edbe8b",
      "parents": [
        "8374f8fce997c0e1df39f0b515ca494b0a15dbdc"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Sat Mar 21 11:40:18 2009 -0700"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Mon Mar 23 12:00:23 2009 -0700"
      },
      "message": "Deal better with situations where OpenCORE is disabled.\n"
    },
    {
      "commit": "87e445b4bed2931b9033aff68878cd4b392e1fab",
      "tree": "2a6b28c0a3b73ccb81dba2d78681a63b482c5542",
      "parents": [
        "1179bc9b0e3d17c984e8f4ad38561c049dd102fa"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Mar 19 23:08:54 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Mar 19 23:08:54 2009 -0700"
      },
      "message": "auto import from //branches/cupcake_rel/...@141571\n"
    },
    {
      "commit": "1179bc9b0e3d17c984e8f4ad38561c049dd102fa",
      "tree": "1fd069efb58601650c80f77da0e2dc7d93641068",
      "parents": [
        "c048cae0367db6fbb4fe1127be5011910713d4ad"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Mar 18 17:39:46 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Mar 18 17:39:46 2009 -0700"
      },
      "message": "auto import from //branches/cupcake_rel/...@140373\n"
    },
    {
      "commit": "8374f8fce997c0e1df39f0b515ca494b0a15dbdc",
      "tree": "2c7a31052a78e7e8722c74fc798e6333f054f06f",
      "parents": [
        "eb7dc8939c06a1755d7c82baf0d0d008aa4d5fcb",
        "c048cae0367db6fbb4fe1127be5011910713d4ad"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Mar 18 11:33:14 2009 -0700"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Mar 18 11:33:14 2009 -0700"
      },
      "message": "Merge commit \u0027remotes/korg/cupcake\u0027 into merge\n\nConflicts:\n\tcore/java/android/view/animation/TranslateAnimation.java\n\tcore/jni/Android.mk\n\tcore/res/res/values-en-rGB/strings.xml\n\tlibs/audioflinger/AudioFlinger.cpp\n\tlibs/surfaceflinger/LayerScreenshot.cpp\n\tpackages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java\n"
    },
    {
      "commit": "c048cae0367db6fbb4fe1127be5011910713d4ad",
      "tree": "e567bfa2e8218b065db13858b77b12b2f2d8d53a",
      "parents": [
        "65e731f393f704eedab6fbe0af7f8a580c8d4617"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Mar 13 13:04:22 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Mar 13 13:04:22 2009 -0700"
      },
      "message": "auto import from //branches/cupcake_rel/...@138607\n"
    },
    {
      "commit": "65e731f393f704eedab6fbe0af7f8a580c8d4617",
      "tree": "4130ea5fa8057abe670e7eded32794615b53b49f",
      "parents": [
        "8365529381f6284f2d59dcc38e26f73adeec9c67"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Mar 11 12:11:56 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Mar 11 12:11:56 2009 -0700"
      },
      "message": "auto import from //branches/cupcake/...@137873\n"
    },
    {
      "commit": "8365529381f6284f2d59dcc38e26f73adeec9c67",
      "tree": "a3bd9bc7d231f3e3addb48bff81799f62253d3ce",
      "parents": [
        "87e06b6ae58d0caca9196e31490f2a5b515a9740"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Mar 09 11:52:12 2009 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Mar 09 11:52:12 2009 -0700"
      },
      "message": "auto import from //branches/cupcake/...@137197\n"
    },
    {
      "commit": "87e06b6ae58d0caca9196e31490f2a5b515a9740",
      "tree": "276df3cec15961f38158af2b25b05bb763c74a90",
      "parents": [
        "8555d0867c3e8fe6cc5c7ad40af557fe6b92fa72"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Mar 05 17:04:48 2009 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Mar 05 17:04:48 2009 -0800"
      },
      "message": "auto import from //depot/cupcake/@136654\n"
    },
    {
      "commit": "8555d0867c3e8fe6cc5c7ad40af557fe6b92fa72",
      "tree": "3a50795da0d5d03904596ee04d2789d7ee46de02",
      "parents": [
        "89fa4ad53f2f4d57adbc97ae1149fc00c9b6f3c5"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Mar 05 14:34:35 2009 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Mar 05 14:34:35 2009 -0800"
      },
      "message": "auto import from //depot/cupcake/@136594\n"
    },
    {
      "commit": "89fa4ad53f2f4d57adbc97ae1149fc00c9b6f3c5",
      "tree": "28d26f7b71e943e25c7da6e8043d79b7b8d9cf7b",
      "parents": [
        "15f767b960b38059a74a42a33e16d8df2aec8bc1"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 03 19:31:44 2009 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 03 19:31:44 2009 -0800"
      },
      "message": "auto import from //depot/cupcake/@135843\n"
    },
    {
      "commit": "15f767b960b38059a74a42a33e16d8df2aec8bc1",
      "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
      "parents": [
        "ad04d9201452001dbaac4349f084cc9316190b89"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 03 18:28:45 2009 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 03 18:28:45 2009 -0800"
      },
      "message": "auto import from //depot/cupcake/@135843\n"
    },
    {
      "commit": "ad04d9201452001dbaac4349f084cc9316190b89",
      "tree": "e8a8fbc4b27adf44a21e884351eecf47fca7e0b6",
      "parents": [
        "99ffda877980468a9ae31e013cd10fb3645df1b0"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 03 14:04:24 2009 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 03 14:04:24 2009 -0800"
      },
      "message": "auto import from //depot/cupcake/@132589\n"
    },
    {
      "commit": "99ffda877980468a9ae31e013cd10fb3645df1b0",
      "tree": "dbcbf90028d4e60763724ca1bac4a63af7170973",
      "parents": [
        "925a349b45d1d16eaaca6a1f4827191831271ca0"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Mar 02 22:54:33 2009 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Mar 02 22:54:33 2009 -0800"
      },
      "message": "auto import from //depot/cupcake/@137055\n"
    },
    {
      "commit": "eb7dc8939c06a1755d7c82baf0d0d008aa4d5fcb",
      "tree": "f82707855820ec4d6547b96a7f925288869e4625",
      "parents": [
        "74b79edce2638fe87fb4ec8f7702fcd70b72207d"
      ],
      "author": {
        "name": "root",
        "email": "pmerle@kph.uni-mainz.de",
        "time": "Mon Mar 02 20:48:27 2009 +0100"
      },
      "committer": {
        "name": "root",
        "email": "pmerle@kph.uni-mainz.de",
        "time": "Mon Mar 02 20:48:27 2009 +0100"
      },
      "message": "Fixed typing mistake causing process crashes.\n"
    },
    {
      "commit": "925a349b45d1d16eaaca6a1f4827191831271ca0",
      "tree": "e8a8fbc4b27adf44a21e884351eecf47fca7e0b6",
      "parents": [
        "25658fd43d150a45fb37734a9f9f27f48bb5c133"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Feb 20 07:38:31 2009 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Feb 20 07:38:31 2009 -0800"
      },
      "message": "auto import from //branches/cupcake/...@132569\n"
    },
    {
      "commit": "25658fd43d150a45fb37734a9f9f27f48bb5c133",
      "tree": "3b7102362b1c84181f8af6f2752bb6e7eb74881a",
      "parents": [
        "7a2146d5807030b2629f347736be5301b61e8811"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Feb 19 10:57:31 2009 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Feb 19 10:57:31 2009 -0800"
      },
      "message": "auto import from //branches/cupcake/...@132276\n"
    }
  ],
  "next": "7a2146d5807030b2629f347736be5301b61e8811"
}
