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 15935aad to master
[android-x86/frameworks-base.git] / api /
2013-03-31 Amith Yamasaniresolved conflicts for merge of 15935aad to master tree | commitdiff
2013-03-31 Amith Yamasaniam 42bc734b: Merge "Block access to accounts for limite... tree | commitdiff
2013-03-31 Amith YamasaniMerge "Block access to accounts for limited users.... tree | commitdiff
2013-03-31 Amith YamasaniBlock access to accounts for limited users. tree | commitdiff
2013-03-30 Geremy Condraam 1ad4ce69: am cac0e0b1: Merge "Add SELinux updater... tree | commitdiff
2013-03-30 Geremy CondraMerge "Add SELinux updater and Settings-based enforceme... tree | commitdiff
2013-03-30 Jean-Michel Triviam 3af2d3f1: am 6f268369: Fix RemoteControlStackEntry... tree | commitdiff
2013-03-30 Amith Yamasaniam 5c98b904: am 9e8ba8f2: Merge "Improve RestrictionEnt... tree | commitdiff
2013-03-30 Amith Yamasaniam 9e8ba8f2: Merge "Improve RestrictionEntry API" into... tree | commitdiff
2013-03-30 Amith YamasaniMerge "Improve RestrictionEntry API" into jb-mr2-dev tree | commitdiff
2013-03-30 Fabrice Di Meglioam 68951ee9: am 83390182: Merge "Optimize ViewGroup... tree | commitdiff
2013-03-30 Fabrice Di MeglioMerge "Optimize ViewGroup.MarginLayoutParams memory... tree | commitdiff
2013-03-30 Elliott Hughesam 1e61ea82: am 55e9d98d: Merge "Clarify the documentat... tree | commitdiff
2013-03-30 Amith YamasaniImprove RestrictionEntry API tree | commitdiff
2013-03-30 Elliott Hughesam 55e9d98d: Merge "Clarify the documentation of Sparse... tree | commitdiff
2013-03-29 kmccormickam 160c0059: am 257719ec: am cccf6e9b: am 9f0ed0ee... tree | commitdiff
2013-03-29 kmccormickam cccf6e9b: am 9f0ed0ee: am 58db9597: am e4ca0650... tree | commitdiff
2013-03-29 kmccormickam 9f0ed0ee: am 58db9597: am e4ca0650: am 31ed1722... tree | commitdiff
2013-03-29 kmccormickam 58db9597: am e4ca0650: am 31ed1722: Merge "Doc updat... tree | commitdiff
2013-03-29 kmccormickam cb937f23: am be1339ed: am 328f7b71: am 90fa2ae2... tree | commitdiff
2013-03-29 kmccormickam 5614e462: am a92ca7fa: am a8858d21: am 93c4446a... tree | commitdiff
2013-03-29 Kenny Rootam 7d164f66: am 557ec556: Merge "KeyStore: add API... tree | commitdiff
2013-03-29 Michael Wrightam b09b5d42: am ee5880c9: Merge "Finish any event in... tree | commitdiff
2013-03-29 Kenny Rootam 557ec556: Merge "KeyStore: add API to query storage... tree | commitdiff
2013-03-29 kmccormickam 328f7b71: am 90fa2ae2: am 23b55e78: am 3fab60bd... tree | commitdiff
2013-03-29 kmccormickam a8858d21: am 93c4446a: am 75fa3012: am 18f76d62... tree | commitdiff
2013-03-29 kmccormickam 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0... tree | commitdiff
2013-03-29 kmccormickam 93c4446a: am 75fa3012: am 18f76d62: am a353a9f8... tree | commitdiff
2013-03-29 kmccormickam 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc updat... tree | commitdiff
2013-03-29 kmccormickam 75fa3012: am 18f76d62: am a353a9f8: Merge "Doc updat... tree | commitdiff
2013-03-29 Michael WrightMerge "Finish any event in the current input queue... tree | commitdiff
2013-03-29 kmccormickam 306a5d0f: am da160ec3: am 6eebd6e6: am 6f50c846... tree | commitdiff
2013-03-29 kmccormickam 6eebd6e6: am 6f50c846: am d2c1e947: am 39f864b1... tree | commitdiff
2013-03-29 kmccormickam 6f50c846: am d2c1e947: am 39f864b1: am 5018688b... tree | commitdiff
2013-03-29 kmccormickam d2c1e947: am 39f864b1: am 5018688b: Merge "Doc updat... tree | commitdiff
2013-03-29 kmccormickam 962088fd: am 10d598a2: am ac1807ab: am acf47ca6... tree | commitdiff
2013-03-29 kmccormickam ac1807ab: am acf47ca6: am da03abb6: am addfe2be... tree | commitdiff
2013-03-29 Kenny Rootam 9759a476: am b3817722: Merge "KeyStore: add API... tree | commitdiff
2013-03-29 kmccormickam cd186198: am 0525c09b: am 138ad7ba: am a80a7164... tree | commitdiff
2013-03-29 kmccormickam bea4797d: am da58f7f1: am d80f5809: am 7c805a0e... tree | commitdiff
2013-03-29 Jatin Lodhiaam 98c762bf: am ce66fd74: Merge "AccountManager changes... tree | commitdiff
2013-03-29 Romain Guyam 254f8082: am 77ebbbe0: Merge "Prevent crash when... tree | commitdiff
2013-03-29 Fabrice Di Meglioam 3526196d: am 3dc52ce7: Merge "Fix bug #8505156 WiFi... tree | commitdiff
2013-03-29 kmccormickam acf47ca6: am da03abb6: am addfe2be: am d51a557a... tree | commitdiff
2013-03-29 Irfan Sheriffam 2b2845b0: am 964a6a7e: Merge "Scope certs for wifi... tree | commitdiff
2013-03-29 Raph Levienam 2adf34e3: am 76a40744: Merge "Switch indic fonts... tree | commitdiff
2013-03-29 Raph Levienam 0a914107: am 8fed6bc8: Merge "Make zero width space... tree | commitdiff
2013-03-29 Dianne Hackbornam d680287b: am cb5a4bf2: Merge "Apparently SystemUI... tree | commitdiff
2013-03-29 kmccormickam da03abb6: am addfe2be: am d51a557a: Merge "Doc updat... tree | commitdiff
2013-03-29 Jean-Michel Triviresolved conflicts for merge of 99bd302c to master tree | commitdiff
2013-03-29 Kenny RootMerge "KeyStore: add API to query storage type" into... tree | commitdiff
2013-03-29 kmccormickam 138ad7ba: am a80a7164: am 859a4301: am 4e259b2c... tree | commitdiff
2013-03-29 kmccormickam a80a7164: am 859a4301: am 4e259b2c: am 0e6691be... tree | commitdiff
2013-03-29 kmccormickam 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc updat... tree | commitdiff
2013-03-29 kmccormickam d80f5809: am 7c805a0e: am 404eb8d3: am a243e162... tree | commitdiff
2013-03-29 kmccormickam 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25... tree | commitdiff
2013-03-29 kmccormickam 404eb8d3: am a243e162: am 82a42a25: Merge "Doc updat... tree | commitdiff
2013-03-29 Jatin Lodhiaam ce66fd74: Merge "AccountManager changes for profile... tree | commitdiff
2013-03-29 Jatin LodhiaMerge "AccountManager changes for profile seeding.... tree | commitdiff
2013-03-29 Irfan SheriffMerge "Scope certs for wifi UID and handle migration... tree | commitdiff
2013-03-29 Raph LevienMerge "Switch indic fonts to Noto" into jb-mr2-dev tree | commitdiff
2013-03-29 Raph LevienMerge "Make zero width space a line breaker" into jb... tree | commitdiff
2013-03-29 The Android Open... am 3cea00ac: (-s ours) Reconcile with jb-mr2-release... tree | commitdiff
2013-03-29 Dianne HackbornMerge "Apparently SystemUI no longer needs the carousel... tree | commitdiff
2013-03-29 The Android Open... Reconcile with jb-mr2-release - do not merge tree | commitdiff
2013-03-29 Victoria Leaseam fef08dc1: am a4b68908: Merge "bidiFlags != SkPaint... tree | commitdiff
2013-03-29 Victoria LeaseMerge "bidiFlags != SkPaint::Flags" into jb-mr2-dev tree | commitdiff
2013-03-29 Lorenzo Colittiam 742056ee: am 2fb669e6: Merge "Stop clat if it\'s... tree | commitdiff
2013-03-29 Lorenzo ColittiMerge "Stop clat if it's no longer in use." into jb... tree | commitdiff
2013-03-29 kmccormickam 8706df1c: am 326e8bf8: am 84bba952: am 297409fe... tree | commitdiff
2013-03-29 kmccormickam 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4... tree | commitdiff
2013-03-29 kmccormickam 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503... tree | commitdiff
2013-03-29 kmccormickam 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc updat... tree | commitdiff
2013-03-29 kmccormickam d0bc2d8d: am 798bb617: am 5652935a: am 5a5ff0b8... tree | commitdiff
2013-03-29 kmccormickam 5652935a: am 5a5ff0b8: am 6754e05b: am c1fbc91b... tree | commitdiff
2013-03-29 kmccormickam 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1... tree | commitdiff
2013-03-29 kmccormickam 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc updat... tree | commitdiff
2013-03-28 Kenny Rootam 005f90b5: am 709f140b: am e89ebc76: am ce7f2723... tree | commitdiff
2013-03-28 Geremy Condraam a54e0643: am 9d034deb: am 24948d3c: am 946a5c91... tree | commitdiff
2013-03-28 Kenny Rootam e89ebc76: am ce7f2723: Merge "AndroidKeyStore: add... tree | commitdiff
2013-03-28 Geremy Condraam 24948d3c: am 946a5c91: Merge "Save off the seinfo... tree | commitdiff
2013-03-28 kmccormickam 89ef9628: am eff1151d: am 0de7af1e: am c9c63003... tree | commitdiff
2013-03-28 kmccormickam 0de7af1e: am c9c63003: am fd245a2e: am 593c0dbf... tree | commitdiff
2013-03-28 Romain Guyam 2c3dcfcd: am 5399a564: Merge "Update layers to clear... tree | commitdiff
2013-03-28 kmccormickam c9c63003: am fd245a2e: am 593c0dbf: am 378d4367... tree | commitdiff
2013-03-28 kmccormickam fd245a2e: am 593c0dbf: am 378d4367: Merge "Doc updat... tree | commitdiff
2013-03-28 Romain GuyMerge "Update layers to clear them Bug #8489505" into... tree | commitdiff
2013-03-28 Eric Laurentam 5efd8942: am dac3fd9d: Merge "audio service: fix... tree | commitdiff
2013-03-28 kmccormickam 0aeb824b: am af7c60be: am a25c43f5: am 3121868c... tree | commitdiff
2013-03-28 Eric LaurentMerge "audio service: fix BT SCO intent permission... tree | commitdiff
2013-03-28 kmccormickam a25c43f5: am 3121868c: am 38e94e9f: am 4d0beb7e... tree | commitdiff
2013-03-28 kmccormickam 3121868c: am 38e94e9f: am 4d0beb7e: am 4f414b79... tree | commitdiff
2013-03-28 kmccormickam 38e94e9f: am 4d0beb7e: am 4f414b79: Doc update:... tree | commitdiff
2013-03-28 Matthew Xieam e4eb23ec: am 84e594f7: Merge "Unhide Bluetooth Low... tree | commitdiff
2013-03-28 Matthew Xieam 84e594f7: Merge "Unhide Bluetooth Low Energy public... tree | commitdiff
2013-03-28 Matthew XieMerge "Unhide Bluetooth Low Energy public APIs" into... tree | commitdiff
2013-03-28 kmccormickam ce2db15d: am 80ab68ce: am 5c3ddcd1: am 425c3d5f... tree | commitdiff
2013-03-28 Matthew XieUnhide Bluetooth Low Energy public APIs tree | commitdiff
2013-03-28 kmccormickam 5c3ddcd1: am 425c3d5f: am 99049335: am 3ed65cb3... tree | commitdiff
2013-03-28 kmccormickam 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a... tree | commitdiff
next
frameworks/base
About OSDN
Find Software
Develop Software
Help