)]}'
{
  "commit": "83db8f75afbb37010450a6a5607764dedf20db6b",
  "tree": "a125cec814362b362eefa3b70bec5eef746400b9",
  "parents": [
    "abfe7a063bbaebdca8703d27137c8c9aed826dac"
  ],
  "author": {
    "name": "Luis Hector Chavez",
    "email": "lhchavez@google.com",
    "time": "Wed Jun 01 20:11:15 2016 +0000"
  },
  "committer": {
    "name": "Luis Hector Chavez",
    "email": "lhchavez@google.com",
    "time": "Wed Jun 01 21:48:37 2016 +0000"
  },
  "message": "Reland \"Merge remote-tracking branch \u0027weave/master\u0027 into \u0027weave/aosp-master\u0027\"\n\nThis reverts commit abfe7a063bbaebdca8703d27137c8c9aed826dac.\n\nAll necessary changes are ready in AOSP for this to land.\n\nChange-Id: I9ac99ebbb292e047e6d6a7978e5748987d7f0f9d\nReviewed-on: https://weave-review.googlesource.com/3720\nReviewed-by: Alex Vakulenko \u003cavakulenko@google.com\u003e\n",
  "tree_diff": [
    {
      "type": "delete",
      "old_id": "f92c8386259ead57759309e20e22961110c56517",
      "old_mode": 33188,
      "old_path": "examples/daemon/oven/oven.cc",
      "new_id": "0000000000000000000000000000000000000000",
      "new_mode": 0,
      "new_path": "/dev/null"
    },
    {
      "type": "delete",
      "old_id": "56da8409b2caf09a101672919fd85770c2350d54",
      "old_mode": 33188,
      "old_path": "examples/daemon/speaker/speaker.cc",
      "new_id": "0000000000000000000000000000000000000000",
      "new_mode": 0,
      "new_path": "/dev/null"
    },
    {
      "type": "modify",
      "old_id": "555322cc99c9d695d4e0ada6f63ef43191be3d83",
      "old_mode": 33188,
      "old_path": "examples/examples.mk",
      "new_id": "cb64e2b5dfd2549eb18ef319ec6042ce56035321",
      "new_mode": 33188,
      "new_path": "examples/examples.mk"
    },
    {
      "type": "modify",
      "old_id": "ddd46309ccd383d075719b286e1fbdcdb0f72f9d",
      "old_mode": 33188,
      "old_path": "examples/provider/avahi_client.cc",
      "new_id": "36109c4225e1059bf6ab2be303c7b0571af9b13d",
      "new_mode": 33188,
      "new_path": "examples/provider/avahi_client.cc"
    },
    {
      "type": "modify",
      "old_id": "7d9b9327eee2496742dc44ff84c5d0b00bc31349",
      "old_mode": 33188,
      "old_path": "examples/provider/avahi_client.h",
      "new_id": "f9ba01ca889ac285a7c57755dfb62b9c0924833d",
      "new_mode": 33188,
      "new_path": "examples/provider/avahi_client.h"
    },
    {
      "type": "modify",
      "old_id": "3aeac24348f9cc73102b6c238593b7840beeec6d",
      "old_mode": 33188,
      "old_path": "examples/provider/event_network.h",
      "new_id": "6a5617f38982044ab652c72b0415cbf8e59be218",
      "new_mode": 33188,
      "new_path": "examples/provider/event_network.h"
    },
    {
      "type": "modify",
      "old_id": "97f9db93a9a0678af4081b9e9700a0da9817eb34",
      "old_mode": 33188,
      "old_path": "examples/provider/event_task_runner.h",
      "new_id": "a7889504786f5811be1cdcc5b570a2b32e385520",
      "new_mode": 33188,
      "new_path": "examples/provider/event_task_runner.h"
    },
    {
      "type": "modify",
      "old_id": "9476d028c3106a9a6d72c62eaf242bdb49dea71d",
      "old_mode": 33188,
      "old_path": "include/weave/provider/test/fake_task_runner.h",
      "new_id": "9a06a8e129e09f5616a1f9cefd5405461c44f999",
      "new_mode": 33188,
      "new_path": "include/weave/provider/test/fake_task_runner.h"
    },
    {
      "type": "modify",
      "old_id": "2dceedbafbbb2fa53154814099a4c5f554758d21",
      "old_mode": 33188,
      "old_path": "include/weave/settings.h",
      "new_id": "2ebc4f2618d7d390d5de02f88959ab3eaef51a1e",
      "new_mode": 33188,
      "new_path": "include/weave/settings.h"
    },
    {
      "type": "modify",
      "old_id": "93bdf3f591d243c322321a86f17eca77bc023906",
      "old_mode": 33188,
      "old_path": "src/access_revocation_manager_impl.cc",
      "new_id": "1c051de55711b1ba97758cc15031e9e66ae06d9c",
      "new_mode": 33188,
      "new_path": "src/access_revocation_manager_impl.cc"
    },
    {
      "type": "modify",
      "old_id": "e6f367c5d988b009b4f67b6da95873c3201dd287",
      "old_mode": 33188,
      "old_path": "src/bind_lambda.h",
      "new_id": "164e3e465f52d9eabc115b60c8ac52f5757623ba",
      "new_mode": 33188,
      "new_path": "src/bind_lambda.h"
    },
    {
      "type": "modify",
      "old_id": "42a1c236def637ac50f75410d080f34b0839e21c",
      "old_mode": 33188,
      "old_path": "src/privet/privet_handler.cc",
      "new_id": "ada9f444f83dd2e59fe6f5a886d55995d606de30",
      "new_mode": 33188,
      "new_path": "src/privet/privet_handler.cc"
    },
    {
      "type": "modify",
      "old_id": "e64151bc9232a5dd0f9b90868da481931fd1c9f5",
      "old_mode": 33188,
      "old_path": "src/privet/privet_handler.h",
      "new_id": "eab1aa37c9eec64f6fc9decc5581a6cc68b8b3bc",
      "new_mode": 33188,
      "new_path": "src/privet/privet_handler.h"
    },
    {
      "type": "modify",
      "old_id": "44be96fc9df88ce802c3ebcc69d0fad42f0343d6",
      "old_mode": 33188,
      "old_path": "src/privet/privet_types.h",
      "new_id": "2a290d4f1d5f7bcd2583cbad333eac078cf5df09",
      "new_mode": 33188,
      "new_path": "src/privet/privet_types.h"
    },
    {
      "type": "modify",
      "old_id": "990f47c731297320633ee28128eaec880e156210",
      "old_mode": 33188,
      "old_path": "src/streams.h",
      "new_id": "cefcf94d70636db89ec331f165d5e6e35958821d",
      "new_mode": 33188,
      "new_path": "src/streams.h"
    },
    {
      "type": "modify",
      "old_id": "c63c5fec33e41e05dedaea9aff123b448b2e9a13",
      "old_mode": 33188,
      "old_path": "tests_schema/daemon/testdevice/standard_traits.h",
      "new_id": "27586f86646af3dc117967ec64b1f6d50e4797ce",
      "new_mode": 33188,
      "new_path": "tests_schema/daemon/testdevice/standard_traits.h"
    },
    {
      "type": "modify",
      "old_id": "a69ff46afb73494f2ebdb4247bcdedd806e2eeba",
      "old_mode": 33188,
      "old_path": "tests_schema/daemon/testdevice/testdevice.cc",
      "new_id": "7a29eac9154d169820d7dc0caedcd23f66f29a87",
      "new_mode": 33188,
      "new_path": "tests_schema/daemon/testdevice/testdevice.cc"
    },
    {
      "type": "modify",
      "old_id": "76d158b54e47e1080041a94b82218bb4fcb4541b",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/bind_unittest.cc",
      "new_id": "4c4f3e6fdff7caec59bb50f3b639333a1e5ae488",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/bind_unittest.cc"
    },
    {
      "type": "modify",
      "old_id": "3682bf9d355a14da9fe6b7e1d2b17e2899019474",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/callback_internal.h",
      "new_id": "d7007946d538d201189b1d0edf00e317b833098a",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/callback_internal.h"
    },
    {
      "type": "modify",
      "old_id": "7d6a478e8ce067338dfae8917a5cde7440cf9dae",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/callback_list.h",
      "new_id": "7ab79dd8e1fcf79de5b76bc6e2586f49c7e3d974",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/callback_list.h"
    },
    {
      "type": "modify",
      "old_id": "937910e4c1974563f180848d90b7df5e0f3fec92",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/callback_list_unittest.cc",
      "new_id": "bd6634d2f5f03a27bfb41da504e52615a1ea7691",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/callback_list_unittest.cc"
    },
    {
      "type": "modify",
      "old_id": "bf9d76f38aca8011c89340722a975d24aa3520a8",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/callback_unittest.cc",
      "new_id": "0d35a9d504c488c445c269732bc983232b51b015",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/callback_unittest.cc"
    },
    {
      "type": "modify",
      "old_id": "304a7bd631d543f7a99c71e0a72f580fec7af535",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/json/json_parser.cc",
      "new_id": "708965a63cf1d0ef5091435df8841b5963030d66",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/json/json_parser.cc"
    },
    {
      "type": "modify",
      "old_id": "fc04594a14924340c32123da632b4150210a0917",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/json/json_parser.h",
      "new_id": "5bdec588e040899f9228255d70d7d9a9c7bf3648",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/json/json_parser.h"
    },
    {
      "type": "modify",
      "old_id": "956e277773c36e713870e19ca6805c4c432d3b15",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/json/json_parser_unittest.cc",
      "new_id": "a6c360d6179cacb24f9fcc703759d134d929d906",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/json/json_parser_unittest.cc"
    },
    {
      "type": "modify",
      "old_id": "3ab5f754b72072ce9964b3c8eeb156cc27f6bae4",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/json/json_reader.cc",
      "new_id": "4ff7496bbb15f7ca12c800e06e6aee21103814d5",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/json/json_reader.cc"
    },
    {
      "type": "modify",
      "old_id": "c6bcb528e3b1ad0cd44a6b8559065fe56db367f3",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/json/json_reader.h",
      "new_id": "f647724f94a38d6c18a3aa93a51becf866b843f5",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/json/json_reader.h"
    },
    {
      "type": "modify",
      "old_id": "2bfd10e43422e9d13b549e879dc2fbad88c230c3",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/json/json_reader_unittest.cc",
      "new_id": "b1ad46e6653febb2ed23c0be5fae9cb120ecae53",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/json/json_reader_unittest.cc"
    },
    {
      "type": "modify",
      "old_id": "ca99f4df6bdee8c066995ceccb681d30f7fc4187",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/json/json_writer_unittest.cc",
      "new_id": "7aaa78b97f3328ff8393b767d94d58593ba5ada6",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/json/json_writer_unittest.cc"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "8747ac9463323865a28eb7d0baf9a6367ab7b5df",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/memory/ptr_util.h"
    },
    {
      "type": "delete",
      "old_id": "2d2c0ecc4adb90a703a659b743791b07e0fcdb7c",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/memory/scoped_ptr.h",
      "new_id": "0000000000000000000000000000000000000000",
      "new_mode": 0,
      "new_path": "/dev/null"
    },
    {
      "type": "modify",
      "old_id": "601c3790b32a562e125f46f8eb4de2f6e256af0a",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/memory/weak_ptr.h",
      "new_id": "2efb02407cf212a6e2ef07f11dd01fdb3044704c",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/memory/weak_ptr.h"
    },
    {
      "type": "modify",
      "old_id": "fdbb280a7fd80809a782190d40414220ef3c19ac",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/memory/weak_ptr_unittest.cc",
      "new_id": "982becd13bf2ee2bee68440f71fc4d6c89f3f218",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/memory/weak_ptr_unittest.cc"
    },
    {
      "type": "modify",
      "old_id": "fc0233d1623170f30b50351ff31f3f6059e7bdc4",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/rand_util_unittest.cc",
      "new_id": "da4023f50b019a0b99de634407ec82e3ea58cc8c",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/rand_util_unittest.cc"
    },
    {
      "type": "modify",
      "old_id": "29f030166511667f6732839d2f10f405b985f251",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/values.cc",
      "new_id": "4af9919fe49f5f50c792292e1991f55980c03a27",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/values.cc"
    },
    {
      "type": "modify",
      "old_id": "36e24ccd2a547b8bd44cf47ceffbc691a2dc81db",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/values.h",
      "new_id": "fca52397d5d821f71c47fbb6d377869111560ac9",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/values.h"
    },
    {
      "type": "modify",
      "old_id": "b5e47dd38590fe82c8ef6f70a24c3fa23ba58ef2",
      "old_mode": 33188,
      "old_path": "third_party/chromium/base/values_unittest.cc",
      "new_id": "5e49446c07e8d1049ea47628a2546854c2db1df2",
      "new_mode": 33188,
      "new_path": "third_party/chromium/base/values_unittest.cc"
    },
    {
      "type": "modify",
      "old_id": "7dcef0b09125fad1a2b41365250ec22e5ab2e731",
      "old_mode": 33188,
      "old_path": "third_party/chromium/crypto/sha2.cc",
      "new_id": "1ab3fe1c556b4d68599b14819512db0f1f9b6698",
      "new_mode": 33188,
      "new_path": "third_party/chromium/crypto/sha2.cc"
    }
  ]
}