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 534f3e94 to jb-mr1-dev
[android-x86/frameworks-base.git] / core / java /
2014-03-20 Marco Nelissenresolved conflicts for merge of 534f3e94 to jb-mr1-dev tree | commitdiff
2014-03-20 Marco Nelissenam a3337bc7: Merge "Verify certificates" into jb-dev tree | commitdiff
2014-03-19 Victoria Leaseam 183f97b7: am 1c12f9e7: malloc some advances tree | commitdiff
2014-03-19 Victoria Leaseam 1c12f9e7: malloc some advances tree | commitdiff
2014-02-27 Paul Lawrenceam da37ed8b: am b9ba0c6c: Prevent authenticators from... tree | commitdiff
2014-02-27 Paul Lawrenceam b9ba0c6c: Prevent authenticators from using Settings... tree | commitdiff
2014-02-27 Paul LawrencePrevent authenticators from using Settings to launch... tree | commitdiff
2014-01-10 David ChristieMerge commit 'bc39746e' into manualmerge tree | commitdiff
2014-01-10 David Christieam 8e0c7768: DO NOT MERGE: Clear cached locations when... tree | commitdiff
2013-11-08 Christopher Tateam 43253333: am 50cbfd55: System package permission... tree | commitdiff
2013-11-08 Christopher Tateam 50cbfd55: System package permission decls take prece... tree | commitdiff
2013-09-27 Amith Yamasaniam ba1ae3af: am 42786418: Don\'t instantiate non-Fragme... tree | commitdiff
2013-09-27 Amith Yamasaniam 42786418: Don\'t instantiate non-Fragments in Fragme... tree | commitdiff
2013-09-27 Amith YamasaniDon't instantiate non-Fragments in Fragment.instantiate tree | commitdiff
2013-08-14 Kenny Rootam a6226a2d: am 32c99004: Use hostname verifier directl... tree | commitdiff
2013-08-14 Kenny Rootam 32c99004: Use hostname verifier directly instead... tree | commitdiff
2013-08-13 Kenny RootUse hostname verifier directly instead of instance tree | commitdiff
2013-05-06 Christopher Tateam 1b0c9c95: am 81c1d8d3: Ensure install-during-restore... tree | commitdiff
2013-05-06 Christopher Tateam 81c1d8d3: Ensure install-during-restore is like... tree | commitdiff
2013-04-29 Nick Kralevicham f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy ... tree | commitdiff
2013-04-29 Nick Kralevicham 6d8f5b75: libdrm: fix bad strncpy / snprintf calls tree | commitdiff
2013-04-23 Selim GurunMerge commit '8237dd82' into manualmerge tree | commitdiff
2013-04-20 Dirk DoughertyMerge "Doc change: updates for tablet checklist." into... tree | commitdiff
2013-04-20 Selim Gurunam 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter... tree | commitdiff
2013-04-20 Selim Gurunam 679c8f68: am 38915fd4: Revert "Add a delimiter betwe... tree | commitdiff
2013-04-18 Geremy CondraDO NOT MERGE Merge commit '8225df00' into bp tree | commitdiff
2013-04-05 Selim Gurunam 93c39d5d: DO NOT MERGE Fix issues during backport tree | commitdiff
2013-04-04 Selim GurunDO NOT MERGE Fix issues during backport tree | commitdiff
2013-04-04 Selim Gurunam 7918cf4e: DO NOT MERGE Add a delimiter between schem... tree | commitdiff
2013-04-04 Selim Gurunam 38915fd4: Revert "Add a delimiter between scheme... tree | commitdiff
2013-04-04 Selim GurunDO NOT MERGE Add a delimiter between scheme and host tree | commitdiff
2013-04-04 Selim GurunRevert "Add a delimiter between scheme and host" tree | commitdiff
2013-04-04 Selim Gurunam aa2163dd: Add a delimiter between scheme and host tree | commitdiff
2013-04-03 Scott KennedyMerge "docs: Typos and other fixes" into jb-mr1-dev tree | commitdiff
2013-04-01 Selim GurunAdd a delimiter between scheme and host tree | commitdiff
2013-03-26 Joe MalinMerge "Android Training: Accessing Contacts" into jb... tree | commitdiff
2013-03-25 Christopher Tateam 7b3ac9ad: am 0cb27e28: Validate restored file paths... tree | commitdiff
2013-03-25 Christopher Tateam 0cb27e28: Validate restored file paths against their... tree | commitdiff
2013-03-25 Christopher TateValidate restored file paths against their nominal... tree | commitdiff
2013-03-05 Joe MalinMerge "Bug 8289268: Reversed text Content Provider... tree | commitdiff
2013-03-05 Adam KochMerge "Doc fix: update BitmapFactory.Options.inSampleSi... tree | commitdiff
2013-03-02 Jeff Sharkeyam bb2aa63b: am a2e929e1: Tighten enforcement of file... tree | commitdiff
2013-03-02 Jeff Sharkeyam a2e929e1: Tighten enforcement of file modes. tree | commitdiff
2013-03-02 Jeff SharkeyTighten enforcement of file modes. tree | commitdiff
2013-02-26 Jean-Baptiste QueruReconcile with jb-mr1-release - do not merge tree | commitdiff
2013-02-14 qudduscMerge "docs: Updated In-app Billing docs to support... tree | commitdiff
2013-02-13 Joe FernandezMerge "docs: SDK r21.1 - fix download links, Issue... tree | commitdiff
2013-02-13 Joe FernandezMerge "docs: Android SDK 21.1.0 Release Notes" into... tree | commitdiff
2013-02-12 Robert LyMerge "Revert "makefile changes for gcm javadocs""... tree | commitdiff
2013-02-08 Dirk DoughertyMerge "Doc change: remove protocol scheme on dashboard... tree | commitdiff
2013-02-08 Robert LyMerge "makefile changes for gcm javadocs" into jb-mr1-dev tree | commitdiff
2013-02-08 Katie McCormickMerge "Doc change: Scroller Javadoc Bug # 7966653"... tree | commitdiff
2013-02-08 Katie McCormickDoc change: Scroller Javadoc Bug # 7966653 tree | commitdiff
2013-02-05 Robert LyMerge "docs: update auth doc to mention multiple scopes... tree | commitdiff
2013-02-01 Dirk DoughertyMerge "Doc change: Remove proto scheme from src urls... tree | commitdiff
2013-01-30 Scott MainMerge "docs: clarify usage for adb am component option... tree | commitdiff
2013-01-30 Fabrice Di MeglioMerge "Fix Javadoc for View layoutDirection / textDirec... tree | commitdiff
2013-01-30 Fabrice Di MeglioFix Javadoc for View layoutDirection / textDirection... tree | commitdiff
2013-01-16 Scott Kennedydocs: Typos and other fixes tree | commitdiff
2013-01-15 Xavier DucrohetMerge "Fix the single crunch command to return the... tree | commitdiff
2013-01-14 Xia WangMerge "Fix image processing test to include all benchma... tree | commitdiff
2013-01-14 Scott KennedyMerge "docs: Fix a bunch of issues" into jb-mr1-dev tree | commitdiff
2013-01-12 Scott Kennedydocs: Fix a bunch of issues tree | commitdiff
2013-01-09 Scott Maindocs: a few doc bugs tree | commitdiff
2013-01-08 Scott MainMerge "docs: resolve bugs from external tracker" into... tree | commitdiff
2013-01-08 Scott Maindocs: resolve bugs from external tracker tree | commitdiff
2013-01-04 Robert LyMerge "docs: update gms and gcm javadocs with new TOC... tree | commitdiff
2013-01-04 Scott MainMerge "docs: fix broken links and add new sitemap text... tree | commitdiff
2012-12-21 && repo sync -j8Merge "cherrypick from jb-dev-docs: Gestures Class... tree | commitdiff
2012-12-20 Scott MainMerge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev tree | commitdiff
2012-12-20 Scott MainMerge "docs: NDK r8d Release Notes" into jb-mr1-dev tree | commitdiff
2012-12-20 Dirk DoughertyMerge "Doc change: update develop landing page." into... tree | commitdiff
2012-12-20 Scott MainMerge "Doc change: add mention of localized promo graph... tree | commitdiff
2012-12-19 Joe Malinam d4289c6e: am c84b3603: am 8dd6275e: Android Training... tree | commitdiff
2012-12-19 Joe Malinam c84b3603: am 8dd6275e: Android Training: Multiple... tree | commitdiff
2012-12-19 Joe Malinam 8dd6275e: Android Training: Multiple Threads tree | commitdiff
2012-12-17 Joe FernandezMerge "docs: App Template Tool documentation" into... tree | commitdiff
2012-12-17 Robert LyMerge "change onEnd() to withEndAction() in javadocs... tree | commitdiff
2012-12-17 Robert Lychange onEnd() to withEndAction() in javadocs tree | commitdiff
2012-12-14 Joe Malinam cad9660f: am 7eef172e: am ba34f097: Android Training... tree | commitdiff
2012-12-14 Joe Malinam 7eef172e: am ba34f097: Android Training: Loading... tree | commitdiff
2012-12-14 Joe Malinam ba34f097: Android Training: Loading Data in the... tree | commitdiff
2012-12-14 Joe Malinam 7096a17e: am 718c7484: am f0f5efbe: Android Training... tree | commitdiff
2012-12-14 Joe Malinam 718c7484: am f0f5efbe: Android Training: Run in... tree | commitdiff
2012-12-14 Joe Malinam f0f5efbe: Android Training: Run in a Background... tree | commitdiff
2012-12-01 Fabrice Di MeglioMerge "Fix typos in LinearLayout comments" into jb... tree | commitdiff
2012-11-30 Dirk DoughertyMerge "Doc change: add SMP Primer for Android. Support... tree | commitdiff
2012-11-30 Nicolas KleinMerge "Fix some typos and missing @param in android... tree | commitdiff
2012-11-30 Nicolas KleinFix some typos and missing @param in android.os.Bundle tree | commitdiff
2012-11-30 Robert LyMerge "docs: gms fixes" into jb-mr1-dev tree | commitdiff
2012-11-30 Robert LyMerge "docs: add correct toc for google reference"... tree | commitdiff
2012-11-30 Robert LyMerge "Revert "docs: gms javadocs"" into jb-mr1-dev tree | commitdiff
2012-11-30 Svetoslav GanovMerge "Cannot move edit text cursor to first position... tree | commitdiff
2012-11-30 Nick Kralevichresolved conflicts for merge of 011132a7 to jb-mr1-dev tree | commitdiff
2012-11-30 Robert Greenwaltam b8da0376: Secure a handful of framework broadcasts tree | commitdiff
2012-11-29 Robert LyMerge "docs: fix bug 7628699" into jb-mr1-dev tree | commitdiff
2012-11-28 Dirk DoughertyMerge " Doc change - cherry pick from dac-dev: Clean... tree | commitdiff
2012-11-28 Scott MainMerge "docs: update dreamservice description" into... tree | commitdiff
2012-11-28 kmccormick@google.comam d60ea46f: am a880436f: am b7863a3c: Merge "Doc updat... tree | commitdiff
2012-11-28 kmccormick@google.comam a880436f: am b7863a3c: Merge "Doc update: new Notify... tree | commitdiff
next
frameworks/base
About OSDN
Find Software
Develop Software
Help