OSDN Git Service

(root) / android-x86 / frameworks-base.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp
[android-x86/frameworks-base.git] / libs / common_time / common_clock_service.cpp
2014-10-02 Andreas Gamperesolved conflicts for merge of 1dcc75b2 to lmp-dev... blob | commitdiff
2014-10-01 Dan Albertresolved conflicts for merge of fe50cfd5 to lmp-dev... blob | commitdiff
2014-09-30 Elliott Hughesam ee7684ca: am 04517286: Merge "Use strerror(3) when... blob | commitdiff
2014-09-30 Andreas Gamperesolved conflicts for merge of 6290c048 to lmp-dev... blob | commitdiff
2014-09-26 Deepanshu Guptaam 8c61344d: am 528b5862: am 941a8f03: (-s ours) am... blob | commitdiff
2014-09-26 Deepanshu Guptaam ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am... blob | commitdiff
2014-09-26 Deepanshu Guptaam 83951615: am 467aea17: am a39b3b25: (-s ours) am... blob | commitdiff
2014-09-26 Deepanshu Guptaam 14ffff15: am c8cbff8b: Fix error when using list... blob | commitdiff
2014-09-25 Dan Albertam c20a4bd1: (-s ours) am d7baaed8: Merge "Allow AOSP... blob | commitdiff
2014-09-24 Andreas Gamperesolved conflicts for merge of dfdabe37 to lmp-dev... blob | commitdiff
2014-09-24 Bill Yiam 6471a6fa: (-s ours) am 1829a4b4: (-s ours) Merge... blob | commitdiff
2014-09-23 Jeff Vander Stoepam 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8... blob | commitdiff
2014-09-23 Jeff Vander Stoepam 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb... blob | commitdiff
2014-09-22 Marco Nelissenam c840e31d: am fa436298: Merge "Broadcast an intent... blob | commitdiff
2014-09-20 Nick Kralevichresolved conflicts for merge of 4cbee7d2 to lmp-dev... blob | commitdiff
2014-09-20 Christopher Ferrisam 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHE... blob | commitdiff
2014-09-19 Elliott Hughesam 4fec1b48: am 600ca140: Merge "Use constants instead... blob | commitdiff
2014-09-19 Dan Albertresolved conflicts for merge of 1a4527ce to lmp-dev... blob | commitdiff
2014-09-19 Dan Albertresolved conflicts for merge of 8791ebf0 to lmp-dev... blob | commitdiff
2014-09-19 Ian Rogersam ad64befd: am 296a712e: Merge "Make a field final." blob | commitdiff
2014-09-11 Jon Larimeram e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553... blob | commitdiff
2014-09-11 Jean-Michel Triviam 9513f81e: am 24499ba7: am e1f07060: (-s ours) am... blob | commitdiff
2014-09-10 Dan Albertam 140e58b0: (-s ours) am 8bbc5269: Merge "Don\'t check... blob | commitdiff
2014-09-09 Dan Albertresolved conflicts for merge of 1d99636f to lmp-dev... blob | commitdiff
2014-09-09 Dan Albertresolved conflicts for merge of 6c585756 to lmp-dev... blob | commitdiff
2014-09-09 Dan Albertam de86cf13: am 5a6934c0: Merge "Don\'t pollute the... blob | commitdiff
2014-09-09 Dan Albertresolved conflicts for merge of 00fe3544 to lmp-dev... blob | commitdiff
2014-09-08 Elliott Hughesresolved conflicts for merge of 2008cff7 to lmp-dev... blob | commitdiff
2014-09-06 Christopher Ferrisam 7c931e2e: (-s ours) am f4eaaadb: Merge "Fix use... blob | commitdiff
2014-09-06 Christopher Ferrisam ad29afab: am 2b653eab: Merge "Add new header to... blob | commitdiff
2014-09-04 Andreas Gamperesolved conflicts for merge of 82ad9ec3 to lmp-dev... blob | commitdiff
2014-09-04 Deepanshu Guptaam 7119fbb6: am 4df075bc: am 057eb404: (-s ours) am... blob | commitdiff
2014-09-04 Deepanshu Guptaam 0ff5117f: am 7055778e: am a9f56d5a: (-s ours) am... blob | commitdiff
2014-09-04 Deepanshu Guptaam a7ce1107: am 19fa86cf: am 5384d40e: (-s ours) am... blob | commitdiff
2014-09-04 Deepanshu Guptaam ae6f2595: am 409e42a1: am e19464aa: (-s ours) am... blob | commitdiff
2014-09-04 Jean-Michel Triviam 800f3ca4: am 14c8acef: am 5fb35780: am daf113b1... blob | commitdiff
2014-09-04 Narayan Kamatham 04c72e30: am be76be83: Merge "android_media_MediaMux... blob | commitdiff
2014-09-04 Deepanshu Guptaam 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am... blob | commitdiff
2014-09-04 Deepanshu Guptaam 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am... blob | commitdiff
2014-09-04 Deepanshu Guptaam 0ddd915f: am 509e5db1: Merge "Resolve color xml... blob | commitdiff
2014-09-04 Deepanshu Guptaam 1c3a8845: am 47a40013: Merge "Fix "@null" resource... blob | commitdiff
2014-09-03 Jean-Michel Triviam 6d4873f5: am 0511ba50: Do not persist and restore... blob | commitdiff
2014-09-03 Nick Kralevicham ad0a66ac: am c1ce74ca: Merge "Revert "SELinuxMMAC... blob | commitdiff
2014-09-03 Nick Kralevicham 7f534190: am 3d4cfc04: Merge "SELinuxMMAC unit tests" blob | commitdiff
2014-09-02 Nick Kralevicham 60888dba: am 0988daaa: Merge "Add testing api to... blob | commitdiff
2014-09-01 Marcin Kosibaam b1ad72c4: (-s ours) am 25d928f6: Merge "Update WebVi... blob | commitdiff
2014-09-01 Marcin Kosibaam 0b0c8c0a: (-s ours) am 5ddbe722: Merge "Load the... blob | commitdiff
2014-09-01 Marcin Kosibaam f5249619: (-s ours) am 2453f611: Merge "Remove WebVi... blob | commitdiff
2014-08-29 Neil Fulleram 23f6a4ab: am 8178edfc: Merge "Fixing android.text... blob | commitdiff
2014-08-29 Brian Carlstromam d1dc0394: am 6d3c8255: Merge "Remove obsolete pruneD... blob | commitdiff
2014-08-29 Brian Carlstromam c22e56dd: am 7d86375b: Merge "Change /dalvik-cache... blob | commitdiff
2014-08-27 Calin Juravleam d5f23f2e: am 2d3571cc: Merge "Fix the length of... blob | commitdiff
2014-08-27 Calin Juravleam 2f63f7ab: am 852debcc: Merge "Update the handling... blob | commitdiff
2014-08-27 Calin Juravleam 9dcfcff9: (-s ours) am 3bec87c9: Merge "Pass vmSafeM... blob | commitdiff
2014-08-27 Calin Juravleam 5aede5a2: (-s ours) am 9b5112c3: Merge "Make native... blob | commitdiff
2014-08-23 Stephen Hinesam c0d6f025: am 007848ad: Merge "We need to specify... blob | commitdiff
2014-08-22 Stephen Hinesresolved conflicts for merge of 5a2d0432 to lmp-dev... blob | commitdiff
2014-08-21 Robert Greenwaltresolved conflicts for merge of 4b48ce8f to lmp-dev... blob | commitdiff
2014-08-21 Mathieu Chartieram be39e991: am 977c4a5b: Merge "Clean up ExceptionOccu... blob | commitdiff
2014-08-21 Mathieu Chartieram 554bd893: am 8f9ebc8a: Merge "Remove unnecessary... blob | commitdiff
2014-08-18 Stephen Hinesam 4ae9a6d5: am 42895561: Merge "Collapse code paths... blob | commitdiff
2014-08-18 Elliott Hughesam 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set... blob | commitdiff
2014-08-18 Elliott Hughesam 72d3cef8: am 708da446: Merge "Use gettid directly... blob | commitdiff
2014-08-18 Piotr Jastrzebskiam 626e1c65: am 8a28e16c: Merge "Update ziparchive... blob | commitdiff
2014-08-18 Brian Carlstromam 18a7b459: am 7c8318c0: Merge "PackageInfo is a class... blob | commitdiff
2014-08-16 Deepanshu Guptaam b6c923a2: am 59eedf52: Layoutlib: Update wifi and... blob | commitdiff
2014-08-15 Brian Carlstromam 897a2cfc: am 21d1b115: Merge "Disable verification... blob | commitdiff
2014-08-15 Calin Juravleresolved conflicts for merge of 32db2c97 to lmp-dev... blob | commitdiff
2014-08-13 Stephen Hinesam b75dc06b: am 4179e889: Merge "Revert "Collapse code... blob | commitdiff
2014-08-13 Stephen Hinesam 5aaeb8e8: am 24a2ee66: Merge "Collapse code paths... blob | commitdiff
2014-08-12 Jeff Sharkeyam 840e9325: am 2013cb1f: Merge "Prevent system_server... blob | commitdiff
2014-08-12 Craig Mautneram 1a7e5ad0: am 67fe6d1f: Merge "Revert "Fix a bug... blob | commitdiff
2014-08-12 Craig Mautneram 379135d3: am dc0afc91: Merge "Fix a bug: unable... blob | commitdiff
2014-08-11 Adam Powellresolved conflicts for merge of 8432e77b to lmp-dev... blob | commitdiff
2014-08-11 Piotr Jastrzebskiam 388aedee: am 07291ccc: Merge "Remove memory leak." blob | commitdiff
2014-08-08 Calin Juravleam e998bb17: (-s ours) am 94f3e47d: Merge "Fix the... blob | commitdiff
2014-08-08 Calin Juravleam 6db95fc3: am 3d274434: Merge "Pass the name of the... blob | commitdiff
2014-08-07 Calin Juravleam 29965e18: (-s ours) am 7f935726: Merge "Use native... blob | commitdiff
2014-08-06 Deepanshu Guptaam 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628... blob | commitdiff
2014-08-06 Mathieu Chartieram 021cf13e: am 7782c6b3: Merge "Fix JNI error in excep... blob | commitdiff
2014-08-05 Alex Lightresolved conflicts for merge of 37651b60 to lmp-dev... blob | commitdiff
2014-08-04 Brian Carlstromam 5a9b135f: am 20bac14e: Merge changes I69c064b0,I1972c5af blob | commitdiff
2014-08-04 Brian Carlstromam bccea16e: am 1de3c633: Merge "Move from dalvik.vm... blob | commitdiff
2014-07-31 John Reckam a4c5ddf6: (-s ours) am 8c57cead: Merge "[View] Clear... blob | commitdiff
2014-07-31 Craig Mautneram b442d922: am 4895bf78: Merge "Fix a bug that the... blob | commitdiff
2014-07-31 Narayan Kamatham 39b16dd7: am bd855367: Merge "Don\'t assume language... blob | commitdiff
2014-07-31 Narayan Kamatham 8b2de134: am bb97753b: Merge "Switch TextUtils over... blob | commitdiff
2014-07-31 Craig Mautnerresolved conflicts for merge of 5c4b5ede to lmp-dev... blob | commitdiff
2014-07-31 Craig Mautneram f37034ac: am 905fe15e: Merge "[ActivityManager]... blob | commitdiff
2014-07-24 Tim Murrayam 638a2b2d: am 8224edb9: Merge "Update makefile for... blob | commitdiff
2014-07-23 Chris Craikam 88fbb5f4: (-s ours) am 215ecb93: Merge "Restore... blob | commitdiff
2014-07-22 Chris Craikam 8040d6fc: (-s ours) am bfb349e2: Merge "[Bitmap... blob | commitdiff
2014-07-22 Chris Craikam 48242d80: am 50a2d633: Merge "[HWUI] Fix invisible... blob | commitdiff
2014-07-22 Neil Fulleram 1a429047: am fc6346d4: Merge "Rewriting android... blob | commitdiff
2014-07-22 Narayan Kamatham b5c714fc: am e242111c: Merge "Remove copy of Locale... blob | commitdiff
2014-07-22 Dirk Doughertyam f3659284: Doc change: add reminder for developers... blob | commitdiff
2014-07-21 Craig Mautneram b7bb95b0: am 02fd104f: Merge "Skip broadcasting... blob | commitdiff
2014-07-18 Deepanshu Guptaam d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am... blob | commitdiff
2014-07-18 Deepanshu Guptaam 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am... blob | commitdiff
2014-07-18 Deepanshu Guptaam c35afdfd: am cee55fc1: am 99286edc: (-s ours) am... blob | commitdiff
next
frameworks/base
About OSDN
Find Software
Develop Software
Help