)]}' { "log": [ { "commit": "b711f3f7ee0544685ef26a1a4b4755d5a6233dba", "tree": "a597541ade9616440906a10db603d377d2211506", "parents": [ "d144748d4767b2ccfb13857e23f78bc944e9531d" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Mon Aug 15 18:33:44 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Tue Aug 16 08:14:51 2011 -0700" }, "message": "Change generated dependency file names\n\nThis changes the name of the generated dependency files to R.java.d\nand \u003cApkName\u003e.ap_.d respectively.\n\nChange-Id: I17e18770fc0d0a5d31c7b37b40ac1949f45ef13a\n" }, { "commit": "20339b24394be06c5bfe5157a4b35adc48f665eb", "tree": "9752f9a3abb307c58f1fa8644d7f2b252303eec5", "parents": [ "4d1fa60bfe660fd0fc6671116da597c0027cbb16", "7a09ccfb5052dc555d54ef77177083616e8f1b69" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 27 18:26:01 2011 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Wed Jul 27 18:26:01 2011 -0700" }, "message": "Merge \"Remove Debug Code\"" }, { "commit": "7a09ccfb5052dc555d54ef77177083616e8f1b69", "tree": "f6b1bd9157eaa29ac397d3739193a3299566e18a", "parents": [ "6800a80199477c90fc64af7211a177de06478a02" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jul 27 17:45:32 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jul 27 17:45:32 2011 -0700" }, "message": "Remove Debug Code\n\nThis change removes debugging code from FileFinder.\nThis code was considered harmful because it uses the std::cout\nfrom \u003ciostream\u003e.\n\nChange-Id: Iad9b5e8a631883bd4854abdb29bc6df8a5b4a056\n" }, { "commit": "e70b2b8fe0c265171f3a367a66c99b36c62567c7", "tree": "7bc6330ca5ecd1f2993bb1c0f30ac6e633d77b42", "parents": [ "4f3a8db64d75cd3e88213d3b105dc50fc5bd6262", "9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jul 21 16:23:18 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jul 21 16:23:18 2011 -0700" }, "message": "am 9bcf26ea: Merge \"Layoutlib_create flag -p: don\\\u0027t change all accesses to public.\"\n\n* commit \u00279bcf26ea7aa108ce4bf4e973b4774d3e60eebafe\u0027:\n Layoutlib_create flag -p: don\u0027t change all accesses to public.\n" }, { "commit": "9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe", "tree": "fc27ba7544aaa9f2c4d52b991f59adea7121f0be", "parents": [ "3cf039876177b5b314b635bb12a1dae1b42f4605", "caed59d90db8626462baaec351e66b2a3280dc34" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jul 21 16:17:03 2011 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Thu Jul 21 16:17:03 2011 -0700" }, "message": "Merge \"Layoutlib_create flag -p: don\u0027t change all accesses to public.\"" }, { "commit": "ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6", "tree": "8f481d25b1c34db709fff71195008e94134cc861", "parents": [ "b582af31c74a58922120fdb747c1a3b867d95e90", "9bac0a9f93976ff341fc9c46b3a85be767119a88" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 18:49:46 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 18:49:46 2011 -0700" }, "message": "am 9bac0a9f: Merge \"Fix to compile for windows\"\n\n* commit \u00279bac0a9f93976ff341fc9c46b3a85be767119a88\u0027:\n Fix to compile for windows\n" }, { "commit": "9102165fd8be64bdc9110d0839a84fcdfa5b68cb", "tree": "3c9f6a6449ee315a165192ff8f8b9d2280809bc9", "parents": [ "0bc12a0b13719976aff95a801d88e48c64510d11" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jul 20 17:33:08 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jul 20 18:22:26 2011 -0700" }, "message": "Fix to compile for windows\n\nThis change includes a workaround for dirent.h on windows not\nincluding d_type.\n\nChange-Id: Ieaa3f298d2e6b32f2d8367384a1d02a2f5d06cca\n" }, { "commit": "b582af31c74a58922120fdb747c1a3b867d95e90", "tree": "5d173bd4bb432b61324081c45219f62df263999a", "parents": [ "3082449508a8c574d0476fdb988f98d9554637ae", "0bc12a0b13719976aff95a801d88e48c64510d11" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 16:00:44 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 16:00:44 2011 -0700" }, "message": "am 0bc12a0b: Merge \"Added Caching for PreProcessed PNGs\"\n\n* commit \u00270bc12a0b13719976aff95a801d88e48c64510d11\u0027:\n Added Caching for PreProcessed PNGs\n" }, { "commit": "3082449508a8c574d0476fdb988f98d9554637ae", "tree": "b52bf802f09270f3c564661d57e0450b2ffafd4d", "parents": [ "82943ecfe2c4266cf3db50326240825fefcaa38f", "1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 15:23:55 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 15:23:55 2011 -0700" }, "message": "am 1e24ccbd: Merge \"Add generation of dependency file for .ap_ package\"\n\n* commit \u00271e24ccbdd56a45c8bb5f2eba94af5aecd2d02554\u0027:\n Add generation of dependency file for .ap_ package\n" }, { "commit": "8a39da80b33691b0c82458c3b7727e13ff71277e", "tree": "b6fa94370ecb2dba85d5fdb45c83729cef8708e1", "parents": [ "1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Mon Jun 06 17:00:35 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jul 20 15:20:26 2011 -0700" }, "message": "Added Caching for PreProcessed PNGs\n\nAdded a cache management system for pre-processed PNG files\nalong with unit tests. The cache system will be used if\nthe --no-crunch flag is passed to AAPT during the package\nphase. The cache can be updated by a call to \u0027aapt crunch\u0027\n(see usage statement). Also put in benchmarking code.\n\nChange-Id: I58271fb2ee2f5f9075fd74d4ff6f15e7afabd05c\n" }, { "commit": "caed59d90db8626462baaec351e66b2a3280dc34", "tree": "321f7c680bb71591cb2b95fa0afb0449e0c720f3", "parents": [ "d40c93f61ca5b3f2351b8db716f67b58f1625e85" ], "author": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Tue Jul 19 22:36:13 2011 -0700" }, "committer": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Tue Jul 19 22:36:13 2011 -0700" }, "message": "Layoutlib_create flag -p: don\u0027t change all accesses to public.\n\nChange-Id: Icb1709ed0cb275a5a51ca34030695a5e94091499\n" }, { "commit": "82943ecfe2c4266cf3db50326240825fefcaa38f", "tree": "4ed53fe7ca63c27c35379236ab80debace4c0108", "parents": [ "2e659ae59c17a0c0584d35b8c400a294c9d49e12", "d40c93f61ca5b3f2351b8db716f67b58f1625e85" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 10:10:17 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 19 10:10:17 2011 -0700" }, "message": "am d40c93f6: Merge \"Add dependency generation to Aapt for R.java\"\n\n* commit \u0027d40c93f61ca5b3f2351b8db716f67b58f1625e85\u0027:\n Add dependency generation to Aapt for R.java\n" }, { "commit": "2e659ae59c17a0c0584d35b8c400a294c9d49e12", "tree": "0001ad6ea39148a4dafb95e331d397aecf9b3fe4", "parents": [ "a74774fd9146aa22801487d3652dc18e9e328b8e", "42755155d6e8ddc3201b08def2bf262a64fa25f2" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 10:10:15 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 19 10:10:15 2011 -0700" }, "message": "am 42755155: Merge \"Copy once-created R.java into library projects\"\n\n* commit \u002742755155d6e8ddc3201b08def2bf262a64fa25f2\u0027:\n Copy once-created R.java into library projects\n" }, { "commit": "03589cc65355220e0a4a0c816189a9fa25cc81fc", "tree": "ebe98e64c530708e8709025e8ad051c714eab9a3", "parents": [ "9bf34ca6f85309c65b0ebdf614cb8266401b49ba" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Mon Jun 27 16:26:02 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Mon Jul 18 16:37:55 2011 -0700" }, "message": "Add generation of dependency file for .ap_ package\n\nMake Aapt generate a dependency file in the same directory as the\noutput ap_ file if the --generate-dependencies flag is set.\nThis dependency file can then be read by the ant exec loop task\nto see whether to repackage resources.\n\nChange-Id: I763679414daf76369700aa599c26dcf78d4de099\n" }, { "commit": "9bf34ca6f85309c65b0ebdf614cb8266401b49ba", "tree": "50708801cb3c58aa23a32bc1a1ad39315e3aeff5", "parents": [ "ce89f1531ed8b96b8b790b3f8b18dd4cf483f7f0" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Tue Jun 14 13:57:09 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Mon Jun 27 16:44:57 2011 -0700" }, "message": "Add dependency generation to Aapt for R.java\n\nMake Aapt generate a dependency file in the location specified\nby RClassDir for R.java if the --generate-dependencies flag is set.\nThis dependency file is then read by the ant exec loop task\nto see whether to recreate R.java.\n\nChange-Id: I7152dac86b6ea0e448ef65e3a95694afe233c789\n" }, { "commit": "ce89f1531ed8b96b8b790b3f8b18dd4cf483f7f0", "tree": "203ed8910afd70ee30fcece6c3c547383cf20b66", "parents": [ "4fea5373d350f5d855408ffaa41206b8fa743c55" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jun 08 19:31:40 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Mon Jun 27 16:29:38 2011 -0700" }, "message": "Copy once-created R.java into library projects\n\nThis change adds functionality in Aapt to allow specification of\nlibrary projects to copy the generated R.java file into rather\nthan regenerating the file for each library project.\n\nChange-Id: I05939d1dc875bd875be9298ca47cb639235070c6\n" }, { "commit": "2b5f2d01558ba338042f486c754f63873c4061fe", "tree": "17b56eb49a6383f0ca1d1f626a31bc85f1db0129", "parents": [ "9e5d0de9a333683533a021e9733e824cac666d18", "e2b41b0d5c8db85a60cd190c7094052db61114b2" ], "author": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Wed Jun 22 17:44:29 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 22 17:44:29 2011 -0700" }, "message": "am e2b41b0d: Merge \"Laoutlib_creator: keep original of delegate methods.\"\n\n* commit \u0027e2b41b0d5c8db85a60cd190c7094052db61114b2\u0027:\n Laoutlib_creator: keep original of delegate methods.\n" }, { "commit": "865c3bef54228a353fd449a093b0c8d155618296", "tree": "c93e90facdad4fbabb288960427874bd6e7dd2bf", "parents": [ "94062517ae5573f9a1a877a83fe7d8e6d1a2c350" ], "author": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Fri Jun 17 17:12:52 2011 -0700" }, "committer": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Fri Jun 17 19:07:13 2011 -0700" }, "message": "Laoutlib_creator: keep original of delegate methods.\n\nFor specific methods, Layoublib_create can rewrite the implementation\nof a method to invoke a delegate instead of the original code. This\nallows layoutlib to implement native code or override existing behavior.\n\nThis patch also \u0027saves\u0027 the original implementation of a rewritten\nmethod so that the delegate can access the original implementation\nas needed. Obviously this is only done for non-native methods.\n\nGiven a non-native SomeClass.MethodName, we generate 2 methods:\n- A copy of the original method named \"SomeClass.MethodName_original\".\n The content is the original method as-is from the reader.\n- A brand new implementation of SomeClass.MethodName which calls to a\n non-existing method named \"SomeClass_delegate.MethodName\".\n The implementation of this \u0027delegate\u0027 method is done in layoutlib_brigde.\n\nChange-Id: I5ca2cd3ac55991a8e8a51c417e75ee447bf9e9e6\n" }, { "commit": "67f09cd090adae6365ca36546b0a517e51255876", "tree": "b791f629d87bd1d47f4c5494a3183b27a9496de5", "parents": [ "ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f", "d6ce6791f26fd0a7cf89ded2847011a4894013e1" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Jun 06 18:08:40 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 06 18:08:40 2011 -0700" }, "message": "am d6ce6791: Merge \"Cherrypick d1ed33c4 from hc-mr1. do not merge.\" into gingerbread\n\n* commit \u0027d6ce6791f26fd0a7cf89ded2847011a4894013e1\u0027:\n Cherrypick d1ed33c4 from hc-mr1. do not merge.\n" }, { "commit": "ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f", "tree": "4c4f5f9996e54d578e17146a26686d630c5872ce", "parents": [ "fbef58faad5a31faf36294e4d160cbd148ed5458", "ee1b497648a0c3c03b09c4739619f23315d491fb" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Jun 06 18:08:32 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 06 18:08:32 2011 -0700" }, "message": "am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread\n\n* commit \u0027ee1b497648a0c3c03b09c4739619f23315d491fb\u0027:\n Cherrypick 5b61ea6b from hc-mr1\n LayoutLib: enable the LAYOUT_ONLY capability.\n Merge dba35f1b from honeycomb-mr1. do not merge.\n" }, { "commit": "156a211b21fbaeb6391162a056390b9cd8748fae", "tree": "8160f75bb58fa7317256f1ba09530573686ef9f9", "parents": [ "21726044a934f3f4f9827a05bbc8db2477220fa1" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Jun 03 17:25:48 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Jun 03 18:37:09 2011 -0700" }, "message": "Cherrypick d1ed33c4 from hc-mr1. do not merge.\n\nFix zombie threads in the Layoutlib.\n\nSome widgets can create (indirectly) HandlerThread which are started\nbut never stopped.\n\nThis patch use the delegate methods to override the thread run method\nto record which threads are started to be able to call quit() on them\nafter a render.\n\nNote that we should really fix layoutlib_create to be able to call\nthe default implementation from a delegate to remove code duplication.\n\nChange-Id: Iaf5432623e9704bb3114a8e0583c8553282c205e\n" }, { "commit": "21726044a934f3f4f9827a05bbc8db2477220fa1", "tree": "0ac69160ec926901c026f6990983931fb12495bf", "parents": [ "f174cd86bd70c1f1322cc15f42d5fd87223933a0" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Jun 03 15:21:53 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Jun 03 16:02:12 2011 -0700" }, "message": "Cherrypick 5b61ea6b from hc-mr1\n\nFix drawCircle in layoutlib.\n\nChange-Id: I035c48b925cad246ed821e9e59a93d37174982ef\n" }, { "commit": "f174cd86bd70c1f1322cc15f42d5fd87223933a0", "tree": "774eca350a4429c0d87f693c229766eb8e39370b", "parents": [ "8f17523dcac41f5a8962cfb61265c71ad0c0e463" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jun 02 16:38:38 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jun 02 16:38:38 2011 -0700" }, "message": "LayoutLib: enable the LAYOUT_ONLY capability.\n\nChange-Id: Ib302af47d2a83a7ac3def6256bf0b892823f594f\n" }, { "commit": "8f17523dcac41f5a8962cfb61265c71ad0c0e463", "tree": "71e8272a956bc8245222c361ae731e08cf8e09bc", "parents": [ "0aa1017f9183bca752c95af72f73120e102ab2d3" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jun 01 17:39:32 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jun 01 18:32:57 2011 -0700" }, "message": "Merge dba35f1b from honeycomb-mr1. do not merge.\n\nChange-Id: Iebda5ea67fd40cac76a8ca3fe3c3cd4ee95ddebe\nLayoutLib: Properly configure KXmlParser to read UTF8\n" }, { "commit": "228e4716278f450a95be5addacc3c6c940668493", "tree": "9401dd7577be6c74c5eff3028a46be42e80fcbc9", "parents": [ "af83d4ecff0ad1638a1a0f3a3f9805468ed710b4", "34f5991ebe8b203f1720caf95889c15dd131d86e" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue May 24 12:28:38 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 12:28:38 2011 -0700" }, "message": "am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.\n\n* commit \u002734f5991ebe8b203f1720caf95889c15dd131d86e\u0027:\n Merge 6103e22c from honeycomb-mr1. do not merge.\n" }, { "commit": "34f5991ebe8b203f1720caf95889c15dd131d86e", "tree": "373d328201332a614bf871f051505d9d00a6bcdc", "parents": [ "c7b87766b21fe5cf2f644efa8753b936d413dc9a" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 19:07:18 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue May 24 10:55:30 2011 -0700" }, "message": "Merge 6103e22c from honeycomb-mr1. do not merge.\n\nLayoutLib: custom styles override the default style instead of replacing it.\n\nIntead of reading either the custom or the default style for a widget, we\nread both and use the values from the custom style if it exists, or\nfrom the default style otherwise.\n\nChange-Id: Ibcec2e9b1e8a95295ab26ede145c287ff2f30be4\n" }, { "commit": "af83d4ecff0ad1638a1a0f3a3f9805468ed710b4", "tree": "1710ee0a1548b01ce34f9b0d95ce3c8004c52950", "parents": [ "a38fad37c21a13ddf1cc14e5a960f395af558ee8", "c7b87766b21fe5cf2f644efa8753b936d413dc9a" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue May 24 10:54:35 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 10:54:35 2011 -0700" }, "message": "am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.\n\n* commit \u0027c7b87766b21fe5cf2f644efa8753b936d413dc9a\u0027:\n Merge 2402ad60 from honeycomb-mr1. do not merge.\n" }, { "commit": "c7b87766b21fe5cf2f644efa8753b936d413dc9a", "tree": "4655c3dcd0de4b9466d4e7e3eb77c12d1deb422e", "parents": [ "4e4ad34159dc1c720a3e6145bb9f14c60fb1a3f7" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 16:43:57 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 17:51:22 2011 -0700" }, "message": "Merge 2402ad60 from honeycomb-mr1. do not merge.\n\nLayoutLib: Fix Canvas_Delegate.native_concat().\n\nChange-Id: I863c43d65a929816ac7c9e69addcc647dac1878b\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": "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": "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": "779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe", "tree": "ea179e8e6bf4ecce4bae884571189df3aaf661ba", "parents": [ "f0556bb90ff38be96c6099f5efafe386cd7f1083", "4a4d96e7ee682167861434cba05531f04642bf97" ], "author": { "name": "Conley Owens", "email": "cco3@android.com", "time": "Wed Apr 27 13:48:45 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 27 13:48:45 2011 -0700" }, "message": "am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996\n\n* commit \u00274a4d96e7ee682167861434cba05531f04642bf97\u0027:\n Remove errant tag terminator\n Normalize output of XMLtree content\n" }, { "commit": "4a4d96e7ee682167861434cba05531f04642bf97", "tree": "ff08d11397463faa91448545c8d961b89fae1423", "parents": [ "86d1d74762e65b6f64c2d4758aa5fd4af6275696", "0cd48ae3de0609089b8adf532d947a41fc418786" ], "author": { "name": "Conley Owens", "email": "cco3@android.com", "time": "Wed Apr 27 13:06:46 2011 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Wed Apr 27 13:06:46 2011 -0700" }, "message": "Merge changes I0ab47e2f,Ib8016996\n\n* changes:\n Remove errant tag terminator\n Normalize output of XMLtree content\n" }, { "commit": "87b3c0dcc45223ff9d5ab2e39d7b9a6953e03f50", "tree": "8c64414e6f079c9511163657f200d2ee132309f4", "parents": [ "4430670f48f75661293371dab8db55865f5f56e0", "08d9d9a46250c4fad66e9b637e8898a3524c4286" ], "author": { "name": "Kenny Root", "email": "kroot@android.com", "time": "Mon Apr 11 15:33:19 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 11 15:33:19 2011 -0700" }, "message": "am 08d9d9a4: Merge \"Runtime resource overlay, iteration 1.\"\n\n* commit \u002708d9d9a46250c4fad66e9b637e8898a3524c4286\u0027:\n Runtime resource overlay, iteration 1.\n" }, { "commit": "7c94b34b5241b548d68a1cb03d10f697386aac65", "tree": "7247f0e9de9a79b6eb1758b807544a3344f3acf9", "parents": [ "ca7ad44a8b6764b5935143bfe55700cbddb0d990" ], "author": { "name": "Shachar Shemesh", "email": "lingnu@gmail.com", "time": "Mon Apr 11 13:32:19 2011 +0300" }, "committer": { "name": "Shachar Shemesh", "email": "lingnu@gmail.com", "time": "Mon Apr 11 13:32:19 2011 +0300" }, "message": "Normalize output of XMLtree content\n\nMake the output from aapt dump xmltree normalized, so that it is unambigously\ndisplayed regardless of the content of the strings. Previous patch left out\nhandling of XML element content.\n\nChange-Id: Ib8016996c769f3dde7a87f7ecbdf850333f2426a\n" }, { "commit": "4754c79a77dc09259dee7e018710a96fe167bb8e", "tree": "f26fcd18d855e08a3af0e42231d45d0e727b4c44", "parents": [ "efa98a29e01dbb4c700fd6af3353413afcb344d9", "59aad78eae14939c169876b2f632d005f382cf7d" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Apr 06 19:08:11 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 06 19:08:11 2011 -0700" }, "message": "am 59aad78e: LayoutLib: don\\\u0027t render when shader\\\u0027s local matrix is set to 0 scale.\n\n* commit \u002759aad78eae14939c169876b2f632d005f382cf7d\u0027:\n LayoutLib: don\u0027t render when shader\u0027s local matrix is set to 0 scale.\n" }, { "commit": "efa98a29e01dbb4c700fd6af3353413afcb344d9", "tree": "4c36104f201a9b447fef24553c9aab1f9fa122fb", "parents": [ "9645081cc7f31e1151fedbcd5932a100719e91e4", "8a18dba48c354fc47056b07ddec8a32fda266b6a" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Apr 06 19:08:02 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 06 19:08:02 2011 -0700" }, "message": "am 8a18dba4: Merge c5aeac7f from honeycomb.\n\n* commit \u00278a18dba48c354fc47056b07ddec8a32fda266b6a\u0027:\n Merge c5aeac7f from honeycomb.\n" }, { "commit": "59aad78eae14939c169876b2f632d005f382cf7d", "tree": "1c1637f9315d503a67119818379c15f9e9e2be1c", "parents": [ "8a18dba48c354fc47056b07ddec8a32fda266b6a" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Apr 06 17:03:31 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Apr 06 17:03:31 2011 -0700" }, "message": "LayoutLib: don\u0027t render when shader\u0027s local matrix is set to 0 scale.\n\nChange-Id: I7726d87f3dd0475ac662f535a08c6435b8b9ed1f\n" }, { "commit": "8a18dba48c354fc47056b07ddec8a32fda266b6a", "tree": "8dd9444bbe6c1c812d54e336f9fd2d5dcc738c63", "parents": [ "43707a83ec12957fb84a406276a38fbaf4e23fd3" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Apr 05 20:19:17 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Apr 06 14:24:59 2011 -0700" }, "message": "Merge c5aeac7f from honeycomb.\n\nLayoutLib: Fix issue with rendering mode.\n\nWhen the layout content is embedded inside a decor layout\nto emulate system bar (top or bottom) and title bar (or action bar)\nthen the code computing the full required size based on the RenderingMode\nwould fail because the decor layout would prevents the content layout to\ntake as much room as possible.\nThere is also an issue with the way we know render dialogs as the\ndialogs usually as a frame with some padding and the previous measurements\nwould not take into account the dialog padding when increasing the\nscreen size.\n\nThis fix makes the code measure the size of the content layout in the\nnormal rendering, and then separately from the root layout with the proper\nMeasureSpec to let the content grown. The difference in size is then added\nto the screen size.\n\nBug: http://code.google.com/p/android/issues/detail?id\u003d15892\n\nChange-Id: Ie9a6c5e254b16785f817dcb9fae755d4936880aa\n" }, { "commit": "57f4b77c89bafedf9468f9a636561c0c193405c9", "tree": "9e73065411411858c9c6ae350c5ee8ffe14598c3", "parents": [ "c6b22e2727bd3730edd5ad72831a9bb4670d00f3" ], "author": { "name": "Mårten Kongstad", "email": "marten.kongstad@sonyericsson.com", "time": "Thu Mar 17 14:13:41 2011 +0100" }, "committer": { "name": "Kenneth Andersson", "email": "kenneth.andersson@sonyericsson.com", "time": "Fri Apr 01 14:12:10 2011 +0200" }, "message": "Runtime resource overlay, iteration 1.\n\nRuntime resource overlay allows unmodified applications to appear\nas if they had been compiled with additional resources defined. See\nlibs/utils/README for more information.\n\nThis commit is the first iteration of runtime resource overlay. It\nprovides the actual overlay modifications and loading of trusted overlay\npackages (ie residing in /vendor) targeting framework-res.apk.\n\nThis commit loads exactly one overlay package. The overlay,\nif present, must target framework-res.apk and be located at\n/vendor/overlay/framework/framework-res.apk.\n\nChange-Id: If26ee7754813004a96c043dba37fbe99fa3919db\n" }, { "commit": "3a90ec4e6b4973f56dae825c967bbee69e6239cf", "tree": "e09c157bed5ecc30564298b084ea5871948eef0c", "parents": [ "a5b68f39e2936a83eac0b995992724cd5de6905d", "c7c8c599a636a105db0d2eac3b8b332532a7a40f" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Mar 17 16:21:20 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 17 16:21:20 2011 -0700" }, "message": "am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.\n\n* commit \u0027c7c8c599a636a105db0d2eac3b8b332532a7a40f\u0027:\n Merge 67450db0 from honeycomb. Do not merge.\n" }, { "commit": "c7c8c599a636a105db0d2eac3b8b332532a7a40f", "tree": "f2ba035079a3faaa7d2c34f70f37551856577fe5", "parents": [ "5982bf66d4fdea38105d91ff0f9d38660ac87581" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Mar 17 14:11:23 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Mar 17 14:24:50 2011 -0700" }, "message": "Merge 67450db0 from honeycomb. Do not merge.\n\nChange-Id: I0ca140dd6d9279ff313f930739ad40fbbed4f335\nLayoutLib: TypedArray.getDimensionPixelSize can actually return \u003c0\n" }, { "commit": "b7b877a45f469336703844a928482e6438442567", "tree": "ab098f1672291e28c947b5ca6bf3984b72ba7d57", "parents": [ "a82a219a7aaee82d790810f6660924604b7a7e81", "0a98226e3c8cda46786558147a0eb6a56c3370c0" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Mar 15 11:41:13 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 15 11:41:13 2011 -0700" }, "message": "am 0a98226e: Merge 9d76581f from honeycomb. do not merge.\n\n* commit \u00270a98226e3c8cda46786558147a0eb6a56c3370c0\u0027:\n Merge 9d76581f from honeycomb. do not merge.\n" }, { "commit": "a82a219a7aaee82d790810f6660924604b7a7e81", "tree": "bdb1ac8ccea9973ed0bfc6f63141af4d700371a7", "parents": [ "403da3a79af78920b33448bbc8d91c4b8aebf4a4", "b243aabdaf1ba6fdfc0579c9f949e00d562456ed" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Mar 15 11:41:10 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 15 11:41:10 2011 -0700" }, "message": "am b243aabd: Merge adaa12cd from honeycomb. do not merge.\n\n* commit \u0027b243aabdaf1ba6fdfc0579c9f949e00d562456ed\u0027:\n Merge adaa12cd from honeycomb. do not merge.\n" }, { "commit": "f89c37295db5df34c014e0791c976cfa94509068", "tree": "cf510bb67a998133391fc2f469329e494e76924d", "parents": [ "405cb57019e0b0b9c2049c2b06537c0f4981fc37", "48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Mar 15 11:37:01 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 15 11:37:01 2011 -0700" }, "message": "am 48a2a5ad: Merge \"Merge 6f2fb570 from honeycomb. do not merge.\" into gingerbread\n\n* commit \u002748a2a5ad1b7c4979b1d7baf6add4bc32148a75ae\u0027:\n Merge 6f2fb570 from honeycomb. do not merge.\n" }, { "commit": "405cb57019e0b0b9c2049c2b06537c0f4981fc37", "tree": "79779e79315b3bd83c522f7e3f7ce16fa1c2a339", "parents": [ "ceae99835ed909346f23cc604d20a488ac63c6ce", "14e1f523c673315cbc3167448ce9252b455d252c" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Mar 15 11:36:57 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 15 11:36:57 2011 -0700" }, "message": "am 14e1f523: Merge \"Merge c12b4093 from honeycomb. do not merge.\" into gingerbread\n\n* commit \u002714e1f523c673315cbc3167448ce9252b455d252c\u0027:\n Merge c12b4093 from honeycomb. do not merge.\n" }, { "commit": "0a98226e3c8cda46786558147a0eb6a56c3370c0", "tree": "87eef19a8e06439d2cb4d9f81812003c383d7080", "parents": [ "b243aabdaf1ba6fdfc0579c9f949e00d562456ed" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Mar 14 15:12:21 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Mar 15 11:34:19 2011 -0700" }, "message": "Merge 9d76581f from honeycomb. do not merge.\n\nLayoutLib: Fix Arc rendering.\n\nLooks like Java2D and Skia go in different directions for angles.\n\nChange-Id: I4d72db56455afe25b4f51f23a9b29d6c438119ba\n" }, { "commit": "b243aabdaf1ba6fdfc0579c9f949e00d562456ed", "tree": "1468da68a2c7bf06a2db1d821bd203cb6e857a50", "parents": [ "48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Mar 08 11:50:21 2011 -0800" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Mar 15 11:34:18 2011 -0700" }, "message": "Merge adaa12cd from honeycomb. do not merge.\n\nLayoutLib: fix Capabilities and getDimensionPixelSize\n\nCommented out a Capability that is not in ADT 10.\n\nBridgeTypedArray.getDimensionPixelSize shouldn\u0027t call\ngetDimension since most of the code is duplicated, and\nit prevents use from properly detecting malformed attribute\nvalues.\n\nChange-Id: I008334af605a89f240247a13c0024009247ec5af\n" }, { "commit": "2652b618a86c28fe1914c52dd6a91139c3d9b1e7", "tree": "3de7d6475a0144999be2e0e8cfa0455f8e937112", "parents": [ "f354ad108c794bd4c9d1aa9a4f2a526d9c27e224" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Mar 07 20:50:21 2011 -0800" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Mar 14 15:28:50 2011 -0700" }, "message": "Merge 6f2fb570 from honeycomb. do not merge.\n\nLayoutLib: Fix dimension parsing to handle negative value.\n\nAlso make TypedArray.getDimensionPixelSize properly\nhandle negative values (which are not allowed).\n\nChange-Id: I03ffcef5ab7ec7ef95419566776dcc798845fd88\n" }, { "commit": "f354ad108c794bd4c9d1aa9a4f2a526d9c27e224", "tree": "410e6b7090c84b97e12f4bb83366d8b98468f311", "parents": [ "bf079216c607b660a0ad219df6c4752906a7fc61" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Mar 07 20:19:38 2011 -0800" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Mar 14 15:28:50 2011 -0700" }, "message": "Merge c12b4093 from honeycomb. do not merge.\n\nChange-Id: Icfbb70c097d87bf92415c6f0534346adde4c02fe\nLayoutLib: Implement some missing add###() method in Path.\n" }, { "commit": "7b9727558b42aecacd0ea63cf3b3c89e9bfd9e9b", "tree": "9e6f93c54c002ef9f4847f8621ae8a87eef01fc9", "parents": [ "79b66725b7755e403e10a9d073121789f09b1a9e", "edbd6139b9d699879db2f14fb03b7b6a38bab9ea" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Feb 28 12:29:08 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Feb 28 12:29:08 2011 -0800" }, "message": "am edbd6139: Merge \"Merge 1911a6f7 into gingerbread. do not merge.\" into gingerbread\n\n* commit \u0027edbd6139b9d699879db2f14fb03b7b6a38bab9ea\u0027:\n Merge 1911a6f7 into gingerbread. do not merge.\n" }, { "commit": "ce57a7f35344e76689d30f45964d1e37b78280cb", "tree": "880399208681c04fb55a240b9317b65fc135c91b", "parents": [ "e630e5f49ba15005172dceeda7299569b2d2351f", "6504490cde3ec5d48321d539e654d1f2072b33f9" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Feb 28 09:51:38 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Feb 28 09:51:38 2011 -0800" }, "message": "am 6504490c: am dff6b8e7: Merge \"Add --non-constant-id to aapt.\"\n\n* commit \u00276504490cde3ec5d48321d539e654d1f2072b33f9\u0027:\n GpsLocationProvider: Clean up HAL initialization/cleanup sequence\n Fixed GSM encoded network initiated position request\n Ensuring thread-safe usage of DateFormat.\n Fixing infinite loop for zero duration.\n Fix for an infinite loop while scrolling lists.\n WAPPushManager, WAP Push over SMS message handler\n Add --non-constant-id to aapt.\n" }, { "commit": "6504490cde3ec5d48321d539e654d1f2072b33f9", "tree": "d149151c9f41af11830023ee8b9dd783d13e9383", "parents": [ "a2090bea4824cf153c4d9c735ee779613cf2e3d7", "dff6b8e71dda9f5d841fa26408714aec2aef1505" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Feb 28 09:16:38 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Feb 28 09:16:38 2011 -0800" }, "message": "am dff6b8e7: Merge \"Add --non-constant-id to aapt.\"\n\n* commit \u0027dff6b8e71dda9f5d841fa26408714aec2aef1505\u0027:\n GpsLocationProvider: Clean up HAL initialization/cleanup sequence\n Fixed GSM encoded network initiated position request\n Ensuring thread-safe usage of DateFormat.\n Fixing infinite loop for zero duration.\n Fix for an infinite loop while scrolling lists.\n WAPPushManager, WAP Push over SMS message handler\n Add --non-constant-id to aapt.\n" }, { "commit": "efe18b5e3f02a51a3900d5a0a3687d2b5e315b4c", "tree": "c8e99e1a56e77075aaf2dc3d7b7adf051e9a3018", "parents": [ "092238916fd5d10090c0bcad33644778a1f366e7" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Feb 24 13:51:26 2011 -0800" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Feb 25 14:53:32 2011 -0800" }, "message": "Merge 1911a6f7 into gingerbread. do not merge.\n\nChange-Id: I6d56644c4ab1a70eb4a6d0d2e5d84ea4aa674041\nLayoutLib: move tests to their own project.\n" }, { "commit": "db1acf52bb6e4b949bcef09f903d662aed9b8a3a", "tree": "9a408e09e72f0c36f19fdd4d150790c5719e5ea9", "parents": [ "86e43034a6834a274efefaabefc0dbdd1bbc8d35", "1175ef7e2e4f68532d8ade672d7f5502d9946ce4" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Feb 24 16:21:41 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 24 16:21:41 2011 -0800" }, "message": "am 1175ef7e: Merge \"LayoutLib: Adapt the HC layoutlib to GB. do not merge.\" into gingerbread\n\n* commit \u00271175ef7e2e4f68532d8ade672d7f5502d9946ce4\u0027:\n LayoutLib: Adapt the HC layoutlib to GB. do not merge.\n" }, { "commit": "86e43034a6834a274efefaabefc0dbdd1bbc8d35", "tree": "3d66724cf46c80ed1e022ec2c7cbe88ebbf61b62", "parents": [ "be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d", "a4350fc0f3e3a4d4f1893aa000be145287519d99" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Feb 24 16:15:11 2011 -0800" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Feb 24 16:15:11 2011 -0800" }, "message": "resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp\n\nChange-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7\n" }, { "commit": "031d2f8b6db5bf7b249ae1c9a72915bf2d3a8d7b", "tree": "1d1a79124aeadc198088be178a3dea7d8d804e5e", "parents": [ "4b52ec49fee79b0488d6a9eaaa4ea5d74ce90905" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Feb 07 21:30:53 2011 -0800" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Feb 23 19:47:18 2011 -0800" }, "message": "LayoutLib: Adapt the HC layoutlib to GB. do not merge.\n\nChange-Id: I0b2016987a65fabbc0ce7011514543349e9fb929\n" }, { "commit": "4b52ec49fee79b0488d6a9eaaa4ea5d74ce90905", "tree": "5b37f5bc58ed3bacbc8536aabcc7e08a57776801", "parents": [ "2050de5b9a5c097e30545ab822211d49031bd9dc" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Feb 07 21:08:10 2011 -0800" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Feb 23 19:47:02 2011 -0800" }, "message": "LayoutLib: Original import of Honeycomb\u0027s layoutlib. do not merge.\n\nframeworks/base.git @ f0a53435f14d23d9555fc46014352ee6a7baa647\n\nChange-Id: Ibc215751693dc7650683b61bb458f7c8beaf8060\n" }, { "commit": "d06c1afbb920111d6bb77381560faa1fac5f2d69", "tree": "edb82445efe4b01dcf4e88f61d71ff649b84baba", "parents": [ "93552de8e305027fb003401e347b9493c64c981f" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Feb 14 16:58:00 2011 -0800" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Feb 14 17:06:19 2011 -0800" }, "message": "Add --non-constant-id to aapt.\n\nThis option enbables creating resource constant in the R class\nthat are not actual constant, but simply static fields.\n\nThe goal is to build library projects with these types of\nIDs so that the constant does not get inlined in the library\ncode, since the ID for the library resources only are not\nthe final values.\n\nThe final resource IDs, generated from the main project and\nits library(ies), will have proper constant with the final\nvalues.\n\nThis allows us to generate binary library bundle (a jar file\nand associated resources) that can be distributed. Additionally,\nthis will let us make the library project support in Eclipse\nmuch more robust and a better user experience overall.\n\nChange-Id: Ibe2f08d68493fde658fc3f7606abf7446f312ad2\n" }, { "commit": "a1f5e82f37c77af7b1d630b5bca715d1742f1234", "tree": "c7b1d7c8c18f5d74370558cbcf48ca6747661096", "parents": [ "71bb59f9e6799083830077dbb7e0f1effdd3faf7", "a30063d80c08434ac3c7316f338c6d54110449ab" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@android.com", "time": "Sat Jan 29 23:04:50 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 29 23:04:50 2011 -0800" }, "message": "am a30063d8: am 25eb0464: Merge \"Normalize output from aapt d\"\n\n* commit \u0027a30063d80c08434ac3c7316f338c6d54110449ab\u0027:\n Normalize output from aapt d\n" }, { "commit": "25eb04642cb5a72f59a274bbfc92f4f65c6c343e", "tree": "6c59e04e7d9b961b49fccdfb139fe87baaa35855", "parents": [ "bbb5a5ce1922a168335811b177cd7341350c15cc", "9872bf4a2d4ae1e7ded170c8e74d400fe6be9bfb" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@android.com", "time": "Sat Jan 29 22:53:20 2011 -0800" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Sat Jan 29 22:53:20 2011 -0800" }, "message": "Merge \"Normalize output from aapt d\"" }, { "commit": "e802b59280540ce24ea1db61907a0f1f22f01fad", "tree": "cb686057d1c1136b9a763a2191321219fad6ffa2", "parents": [ "3100207be5cb0ef93a5271f24b6f03a2e75291ad", "2107757dde0b3159119edcc9084fcb9a87985e88" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@android.com", "time": "Sat Jan 29 15:05:30 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 29 15:05:30 2011 -0800" }, "message": "am 2107757d: am bbb5a5ce: Merge \"Make AaptGroupEntry::getMncName accept mnc00\"\n\n* commit \u00272107757dde0b3159119edcc9084fcb9a87985e88\u0027:\n Make AaptGroupEntry::getMncName accept mnc00\n" }, { "commit": "bbb5a5ce1922a168335811b177cd7341350c15cc", "tree": "abfdcd3321ec33081bf63095812cf42c7ec0319e", "parents": [ "9720323a5138acafbe30da38d61eeac469b675a4", "5ef0b9d72451d4bb65f5a76a05738041ed15664a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@android.com", "time": "Sat Jan 29 14:38:48 2011 -0800" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Sat Jan 29 14:38:48 2011 -0800" }, "message": "Merge \"Make AaptGroupEntry::getMncName accept mnc00\"" }, { "commit": "1240719ae06855d38f1fa159dd73e2109bb9586f", "tree": "375da085a3b6c07491c0e5b4b2cec9347bcd5b7c", "parents": [ "c3563eb9e75e0b9ae130ec22d5c6c6b1561d783b", "bcf2adeb10c41becec3baa2bcb8de9212272399a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@android.com", "time": "Sun Jan 23 12:57:33 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Jan 23 12:57:33 2011 -0800" }, "message": "am bcf2adeb: Merge \"aapt: Allow raw \"%\" in unformatted string-arrays\"\n\n* commit \u0027bcf2adeb10c41becec3baa2bcb8de9212272399a\u0027:\n aapt: Allow raw \"%\" in unformatted string-arrays\n" }, { "commit": "bf50322a245c430f3b3a1e7ecc299fe0a939daec", "tree": "ca114f9d2be8f42e406f404fbcc2eea25c57e16c", "parents": [ "35f4d32dc2f0c383323e780ecc7e2764704c5d2c" ], "author": { "name": "Josh Stone", "email": "cuviper@gmail.com", "time": "Mon Jan 17 18:34:11 2011 -0800" }, "committer": { "name": "Josh Stone", "email": "cuviper@gmail.com", "time": "Sat Jan 22 21:13:12 2011 -0800" }, "message": "aapt: Allow raw \"%\" in unformatted string-arrays\n\nCommit 15fe2cb added format checking for translatable strings, enforcing\nthe use of positional args. This check can be disabled on \u003cstring\u003e\nvalues with translatable\u003d\"false\" or formatted\u003d\"false\". But they didn\u0027t\ncheck for those attributes on \u003cstring-array\u003e, so some of CM\u0027s strings\nfail when they\u0027re not really format strings, just because they contain\npercent signs. (e.g. brightness widget\u0027s \"Auto/Dim/40%/100%\")\n\nSo now the formatted/translatable attributes are checked in string-array\ntoo, and we can restore our proper percent signs.\n\nChange-Id: I3478ab7e0b939e61fe0cec20201ac55096264080\n" }, { "commit": "9872bf4a2d4ae1e7ded170c8e74d400fe6be9bfb", "tree": "4040c675a82cdab2888c72e56188d8cd91ae547b", "parents": [ "69ebb984f230a523dc316bdb2c9e9c28111364fd" ], "author": { "name": "Shachar Shemesh", "email": "lingnu@gmail.com", "time": "Mon Dec 20 17:38:33 2010 +0200" }, "committer": { "name": "Shachar Shemesh", "email": "lingnu@gmail.com", "time": "Tue Jan 04 20:52:08 2011 +0200" }, "message": "Normalize output from aapt d\n\nMake the output from aapt dump --values resources and aapt dump xmltree normalized, so that it is unambigously displayed\nregardless of the content of the strings.\n\nChange-Id: Ia3bff36c4ee1e9a44f474534e154830948beabdf\n" }, { "commit": "5ef0b9d72451d4bb65f5a76a05738041ed15664a", "tree": "065e751966b6e14ad3483c409139f6fd85be04c5", "parents": [ "69ebb984f230a523dc316bdb2c9e9c28111364fd" ], "author": { "name": "Johan Redestig", "email": "johan.redestig@sonyericsson.com", "time": "Tue Nov 09 14:13:31 2010 +0100" }, "committer": { "name": "Johan Redestig", "email": "johan.redestig@sonyericsson.com", "time": "Tue Jan 04 07:30:32 2011 +0100" }, "message": "Make AaptGroupEntry::getMncName accept mnc00\n\nMNC 00 is a valid network code and is used by\nsome operators, see http://en.wikipedia.org/wiki/Mobile_Network_Code.\n\nRemove the test that checks if atoi returns zero.\nThe string is validated to contain only numbers\nalready.\n\nAlso discussed here:\nhttps://code.google.com/p/android/issues/detail?id\u003d3657\n\nChange-Id: I3220d7980abe4067c9e7aa4cbc10b5fd0b8c9ea7\n" }, { "commit": "0ccc8b7345eac0b507c221be47e55926cbda8957", "tree": "f8e5cc12e260b2dbbe72cbd7c767816782c7f5c2", "parents": [ "7afa161368308e78bb4a66b4fd32558dfd556776", "5441a9ff2128cf2c5088974c74b79d2d1734f755" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Tue Dec 14 11:28:50 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 14 11:28:50 2010 -0800" }, "message": "am 5441a9ff: Merge \"GL texture filtering changed from AND to OR, so rename tag name to match. (\u003cuses-foo\u003e \u003d\u003d AND, \u003csupports-foo\u003e \u003d\u003d OR, e.g. uses-feature vs. supports-screen).\" into gingerbread\n\n* commit \u00275441a9ff2128cf2c5088974c74b79d2d1734f755\u0027:\n GL texture filtering changed from AND to OR, so rename tag name to match. (\u003cuses-foo\u003e \u003d\u003d AND, \u003csupports-foo\u003e \u003d\u003d OR, e.g. uses-feature vs. supports-screen).\n" }, { "commit": "096b67f65510a5076f1f845f9e19dda2b30ea6bb", "tree": "55433fd8a7525c5360b3b4e0cfcd8b1ef4a442f2", "parents": [ "e3f6336bcffc250da90ec864bccfa73ad1d016b9" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Mon Dec 13 16:25:54 2010 -0800" }, "committer": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Mon Dec 13 16:25:54 2010 -0800" }, "message": "GL texture filtering changed from AND to OR, so rename tag name to match.\n(\u003cuses-foo\u003e \u003d\u003d AND, \u003csupports-foo\u003e \u003d\u003d OR, e.g. uses-feature vs.\nsupports-screen).\n\nChange-Id: I0f20aed7f95169d9adfc7fe128191eb6e49d116f\n" }, { "commit": "3442611ee11b2987c83054fe3c7ed5521f27f052", "tree": "ff4a2db0081d7c404b0c5a1bdc4ac28768272405", "parents": [ "8806fc729b96bf806806ef8d82147d59abfc1536", "5580e44c250944f5cd011b2682eea5cc2de9706c" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Nov 05 14:05:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 05 14:05:41 2010 -0700" }, "message": "am 5580e44c: Merge \"Support changing style parent in overlays\"\n\n* commit \u00275580e44c250944f5cd011b2682eea5cc2de9706c\u0027:\n Support changing style parent in overlays\n" }, { "commit": "4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c", "tree": "70ac77a2300fe3d201896d3f2ec81a54ff607233", "parents": [ "04856d99f8f353711f294254c1159461213684a5", "46151652b8dc562f4a3332e1d12fa799e3638ea8" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Nov 05 13:57:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 05 13:57:41 2010 -0700" }, "message": "am 46151652: Merge \"fix xlarge support in aapt for gingerbread\" into gingerbread\n\n* commit \u002746151652b8dc562f4a3332e1d12fa799e3638ea8\u0027:\n fix xlarge support in aapt for gingerbread\n" }, { "commit": "d58fb97ddf052b3ceac921ac7e936af990392b2c", "tree": "69314556c53d6c55ddc9078854f9db0aa270142e", "parents": [ "265acc5085ad03c4c043dd33faed808b55732134" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Nov 04 18:32:00 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Nov 04 18:33:05 2010 -0700" }, "message": "fix xlarge support in aapt for gingerbread\n\nChange-Id: I4d8872fb839a6eadc538055215d4455af328846c\n" }, { "commit": "5580e44c250944f5cd011b2682eea5cc2de9706c", "tree": "e49d19666d7ad5f0f2e9e980f488b0085f163db6", "parents": [ "db2403ff3251bebb5dd6bdb98f826a8e04dc6ed1", "2fda9f45623e888f71c6ea769305ccc4d9e76af2" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Nov 04 07:26:37 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Thu Nov 04 07:26:37 2010 -0700" }, "message": "Merge \"Support changing style parent in overlays\"" }, { "commit": "57f7ccc4223ad7f51aa41b593ed26770f3cca22b", "tree": "861f6de829874fdcbc524976dd808b72af4fa84b", "parents": [ "751cc4245ff65a979317827109818e1e127a53dd", "63e5d07ec9941d64c85210a38d569a719e844940" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Oct 27 11:23:58 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 27 11:23:58 2010 -0700" }, "message": "am 63e5d07e: Merge \"Fix issue with project resources overriding framework resources.\" into gingerbread\n" }, { "commit": "c2e28dd74813799aad132673ff9d302657dd04ed", "tree": "af700b4c91f9135026816458018547e7303dfc32", "parents": [ "2f19f56ac5bcf02ed503bdaf95b724cba8ff782d" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Oct 26 16:58:34 2010 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Oct 26 17:14:55 2010 -0700" }, "message": "Fix issue with project resources overriding framework resources.\n\nFramework resources loaded through Drawable.createFromXml could\nbe overriden by project resources if there were loaded through\na state list drawable where the final resource name was used\nby a project resource (of the same type).\n\nThis ensures that the XML parser knows that it\u0027s a framework\nresource being parsed and that the resource resolution uses\nthat information.\n\nChange-Id: I39cf9eba755e55f1604b968637aeecff969a558d\n" }, { "commit": "a44a5e02d21505a9c891a31a34c83761600024c0", "tree": "0cd858aa1b1ca5560f5c9ead9febc2c2fce88aa2", "parents": [ "cc8de576cd3aaf6c0b7d1515ffb74cb89e4764e3", "1b6180ec317201e51cb4a773c59a825342fd2235" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Oct 26 12:10:28 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 12:10:28 2010 -0700" }, "message": "am 1b6180ec: Merge \"Fix rendering of digitalClock/Gallery in Eclipse editors.\" into gingerbread\n" }, { "commit": "25e96ce7b99f9736a6024d25bd65a83774c7640f", "tree": "2060eeb90d6cd266f526daa2f16bcfe33111a2a6", "parents": [ "106165b5102be226eb8049d2f7f62d7e26034e8a" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Oct 26 11:18:39 2010 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Oct 26 11:18:39 2010 -0700" }, "message": "Fix rendering of digitalClock/Gallery in Eclipse editors.\n\nChange-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216\n" }, { "commit": "2051a1be52b3380285597c62e283e12bf659bda9", "tree": "b6706267e5b25debd3ae3d59f56e91add39c5a27", "parents": [ "faf53c0bf2bd942cc06149364a5425396d958a23", "c5371fadf2753d074ef117685fed05b0140d6864" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Oct 22 13:38:58 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 22 13:38:58 2010 -0700" }, "message": "am c5371fad: Merge \"Make layoutlib use the prebuilt of layoutlib_api\"\n" }, { "commit": "101f14b275ab2451aef50dec427376d721d17aea", "tree": "af8c333d1c2d519c300ab817991b74d51cee43b6", "parents": [ "86f1b643d10e0b5b17ae01db3b81020db87b3295", "ba501785c7b298198d1c6e4787fd40e98f97da67" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 21 20:17:56 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 20:17:56 2010 -0700" }, "message": "am ba501785: Merge \"Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE\" into gingerbread\n\nMerge commit \u0027ba501785c7b298198d1c6e4787fd40e98f97da67\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ba501785c7b298198d1c6e4787fd40e98f97da67\u0027:\n Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE\n" }, { "commit": "0db38449257d6702d18ddf77b019bef38ce3d692", "tree": "bfa3735b5356d9054f47cd6d36013a91dd464864", "parents": [ "db723ea0f70392f712542edb1114fc15e782cdb7" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Oct 21 18:32:37 2010 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Oct 21 18:32:37 2010 -0700" }, "message": "Make layoutlib use the prebuilt of layoutlib_api\n\nChange-Id: Ie04a9e847acacf7b2aeb179589517fc75688c75b\n" }, { "commit": "a6d9c7c04c4b17d85ac70f4494777555655f3be1", "tree": "216d077a636fa8be9369de734e14350886c0e7ac", "parents": [ "7dc08fb070ff7455e794fc81645ccb4349cd152f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 21 15:32:06 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 21 15:32:06 2010 -0700" }, "message": "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE\n\nChange-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb\n" }, { "commit": "ec62719c8396997b436c44906c2760e3914698b8", "tree": "65ac99ded31c48cf278ce7056cf84acff4e59eaa", "parents": [ "8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17", "004f968d0cf60c08d7b393129ed2d6e4304041e5" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Mon Oct 18 11:50:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 11:50:08 2010 -0700" }, "message": "am 004f968d: Merge \"Link against the static libcrypto in external/openssl.\" into gingerbread\n\nMerge commit \u0027004f968d0cf60c08d7b393129ed2d6e4304041e5\u0027 into gingerbread-plus-aosp\n\n* commit \u0027004f968d0cf60c08d7b393129ed2d6e4304041e5\u0027:\n Link against the static libcrypto in external/openssl.\n" }, { "commit": "a1b592e60dee58aaaf66ce430f3dbe36cf0448bb", "tree": "b34fee41e098d981ebff23052a0999b510a256c7", "parents": [ "d4e03f37423bee383d17f7292753a5f67e497a28" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Thu Oct 14 16:13:31 2010 -0700" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Thu Oct 14 16:13:31 2010 -0700" }, "message": "Link against the static libcrypto in external/openssl.\n\nChange-Id: Iad41ec975f9b9a4aec0b8470678320f5abe03e1f\n" }, { "commit": "35d34c67b7e94639086f2392d674e59b82c26a42", "tree": "9d4f08a5b707a78d8787b19668efa975a6625881", "parents": [ "4fa7f4f4963568258a6b4179176de8386cb5d3db", "3d828e62c856074334a00ce7c621050b4d7166e4" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Oct 14 12:03:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 14 12:03:07 2010 -0700" }, "message": "am 3d828e62: Merge \"Do not build pbkdf2gen on non-Linux hosts\" into gingerbread\n\nMerge commit \u00273d828e62c856074334a00ce7c621050b4d7166e4\u0027 into gingerbread-plus-aosp\n\n* commit \u00273d828e62c856074334a00ce7c621050b4d7166e4\u0027:\n Do not build pbkdf2gen on non-Linux hosts\n" }, { "commit": "a09f1ebeb5fcdb1763b68a077f918bae87a0095d", "tree": "b243e46a81df7ad2e1b05d393998841d29ad6ea3", "parents": [ "bd57eeafe034cf850225db403700b5dc5db5ebcc" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Oct 14 10:25:25 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Oct 14 10:43:15 2010 -0700" }, "message": "Do not build pbkdf2gen on non-Linux hosts\n\nChange-Id: I9f575a2ca7d45102a4f67424ea5866cf750adb13\n" }, { "commit": "8fda1636e3e35f060b9046294efd3c062a1fdb84", "tree": "9c5d4cb8df12357a067f5214eb2f3dbd08d252ca", "parents": [ "e3c50a5470f64fd99438d6fd985f88d9fe20919a", "bdf8034c657147226b2390eef113ff841e0d6065" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 22:54:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 22:54:10 2010 -0700" }, "message": "am bdf8034c: Merge \"OBB: use PBKDF2 for key generation.\" into gingerbread\n\nMerge commit \u0027bdf8034c657147226b2390eef113ff841e0d6065\u0027 into gingerbread-plus-aosp\n\n* commit \u0027bdf8034c657147226b2390eef113ff841e0d6065\u0027:\n OBB: use PBKDF2 for key generation.\n" }, { "commit": "bdf8034c657147226b2390eef113ff841e0d6065", "tree": "58be0affeafef6d38ef9e53744af1aaf1a7a8fa8", "parents": [ "cebe5b2e01f8ebbf9089aebc386caecea232df76", "3b1abba6bbc895d63da3e82e9b158c01bd12eddd" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 18:29:43 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 13 18:29:43 2010 -0700" }, "message": "Merge \"OBB: use PBKDF2 for key generation.\" into gingerbread" }, { "commit": "3b1abba6bbc895d63da3e82e9b158c01bd12eddd", "tree": "1296e8c25a2927c94783eda83100c061fc9fe379", "parents": [ "dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 15:00:07 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 18:25:33 2010 -0700" }, "message": "OBB: use PBKDF2 for key generation.\n\nSwitch to using PBKDF2 for the key generation for OBBs. Any previously\ngenerated OBBs will stop being read correctly. A small pbkdf2gen program\nis available to allow generation of appropriate keys with the salts.\n\nBug: 3059950\nChange-Id: If4305c989fd692fd1150eb270dbf751e09c37295\n" }, { "commit": "8b1082bba91c085baf523212d85f3bfbb6ee9cea", "tree": "09d564ab2bfe8888b17d1fe0ed0cb2d37d77c66e", "parents": [ "a905d9551103c5be465429ffeb0352b78058457e", "3394db7d9432053e56d86b3f24e64deeb3099950" ], "author": { "name": "Jesse Wilson", "email": "jessewilson@google.com", "time": "Wed Oct 13 17:02:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 17:02:48 2010 -0700" }, "message": "am 3394db7d: Merge \"Regenerate preloaded classes for Gingerbread.\" into gingerbread\n\nMerge commit \u00273394db7d9432053e56d86b3f24e64deeb3099950\u0027 into gingerbread-plus-aosp\n\n* commit \u00273394db7d9432053e56d86b3f24e64deeb3099950\u0027:\n Regenerate preloaded classes for Gingerbread.\n" }, { "commit": "3394db7d9432053e56d86b3f24e64deeb3099950", "tree": "5c3f4108526de568b18a583e0be61b7ac1b29d26", "parents": [ "a31cbd61bc53730d756464b0c273475c4f738066", "eaca10e2d0a61c482b6a1799ca9f51d8f67482cb" ], "author": { "name": "Jesse Wilson", "email": "jessewilson@google.com", "time": "Wed Oct 13 16:59:12 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 13 16:59:12 2010 -0700" }, "message": "Merge \"Regenerate preloaded classes for Gingerbread.\" into gingerbread" }, { "commit": "eaca10e2d0a61c482b6a1799ca9f51d8f67482cb", "tree": "0a8d7c05494fe42eacff02ead4a0275909763634", "parents": [ "844a6b3ccaff1ad1443ad985e4527b733ce97c0e" ], "author": { "name": "Jesse Wilson", "email": "jessewilson@google.com", "time": "Tue Oct 12 21:35:56 2010 -0700" }, "committer": { "name": "Jesse Wilson", "email": "jessewilson@google.com", "time": "Wed Oct 13 16:55:26 2010 -0700" }, "message": "Regenerate preloaded classes for Gingerbread.\n\nUnlike previous releases where the set of classes-to-be-preloaded\nwas generated on a first-generation device (G1 and MyTouch 3G), this\nround I used a second-generation device, a Nexus One. As a consequence,\nclass loading is faster (win) and fewer classes hit the 1250ms threshold.\nInstead of sharing classes based on load time alone, classes are now shared\nbased on the number of applications loading them.\n\nChange-Id: I18f7aa3e7e6258818871b3968b515c06314371b3\nhttp://b/2546002\n" }, { "commit": "b58af2b8b3871436942d0e2c878c906bffaa2fb0", "tree": "bedff3eeabf2f1173dcd8dcb5153058c4f39ca09", "parents": [ "89b73a75467d85c58467c5b8c080c77d25860fe0", "5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Wed Oct 13 15:23:27 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 15:23:27 2010 -0700" }, "message": "am 5c62ab0a: Merge \"Adding a new \u003cuses-gl-texture/\u003e tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats.\" into gingerbread\n\nMerge commit \u00275c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1\u0027 into gingerbread-plus-aosp\n\n* commit \u00275c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1\u0027:\n Adding a new \u003cuses-gl-texture/\u003e tag, to be used to enable apps to specify\n" }, { "commit": "6f51fc14d0c3df8f9153ae5df992cc2731f099c8", "tree": "ea1dc04c2e55af8a93c1bc3c7d08ce00182dca15", "parents": [ "527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Wed Oct 13 14:33:43 2010 -0700" }, "committer": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Wed Oct 13 14:33:43 2010 -0700" }, "message": "Adding a new \u003cuses-gl-texture/\u003e tag, to be used to enable apps to specify\nfiltering based on support for OpenGL ES texture and texture compression\nformats.\n\nChange-Id: I993209a673579b296007ae2ba830d0275770dd11\n" }, { "commit": "556866a2ea1f4758a79fe4f207153b71815ed400", "tree": "d1e1e04500d7ffff4be687ab2e6cf36ad68cbc9b", "parents": [ "909a974f8e5df4b6fc2cf8de6c64633406095c6e", "656d21656ad9b33f7d7e1e4960a2f03076a5fc7a" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Oct 07 07:16:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 07 07:16:51 2010 -0700" }, "message": "am 656d2165: Merge \"Parser is optional in obtainStyledAttributes.\" into gingerbread\n\nMerge commit \u0027656d21656ad9b33f7d7e1e4960a2f03076a5fc7a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027656d21656ad9b33f7d7e1e4960a2f03076a5fc7a\u0027:\n Parser is optional in obtainStyledAttributes.\n" }, { "commit": "0a226d84e1e67fc5a180d65246ed942266701fb8", "tree": "7ade3027b041ce09f500d92eafad958350cf876c", "parents": [ "70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c" ], "author": { "name": "Anthony Newnam", "email": "anthony.newnam@garmin.com", "time": "Wed Sep 01 12:06:04 2010 -0500" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Oct 06 18:39:19 2010 -0700" }, "message": "Avoid pre-processing images when they won\u0027t be used\n\nChange-Id: I24db3645c399f66dc7cc0e85909ce34b68ff829e\n" }, { "commit": "f8e4c1f57bbb658f53995443b0f175e50a2fc814", "tree": "95673dc259dc4636da7618f824e9a923d168f8ec", "parents": [ "a29643a6455df7d3d615cdc45e11c437fe4b6cee" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Oct 04 17:41:03 2010 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Oct 04 18:11:50 2010 -0700" }, "message": "Parser is optional in obtainStyledAttributes.\n\nIf the parser is null it just means the default style/values are\nused.\n\nChange-Id: I5ff3d632fd5dfc5a1ce42796b2fef7b30f9fbf34\n" }, { "commit": "10d5b0966d1b6ab0e3b63c71d5325403e75b647e", "tree": "f80bfe84762d9c46202a79c5320546593ae796f8", "parents": [ "b12bfbd4df985041ab0e584ef5a746328baac038", "407f625a9b8e356e765a5ec587c443af1f3aadb5" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 04 14:03:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 14:03:06 2010 -0700" }, "message": "am 407f625a: Add new API to find out whether external storage is removable.\n\nMerge commit \u0027407f625a9b8e356e765a5ec587c443af1f3aadb5\u0027 into gingerbread-plus-aosp\n\n* commit \u0027407f625a9b8e356e765a5ec587c443af1f3aadb5\u0027:\n Add new API to find out whether external storage is removable.\n" } ], "next": "407f625a9b8e356e765a5ec587c443af1f3aadb5" }