summaryrefslogtreecommitdiff
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* am be4536d2: Merge "Adding matching @deprecated."Ian Rogers2013-04-231-0/+1
|\
| * Merge "Adding matching @deprecated."Ian Rogers2013-04-231-0/+1
| |\
| | * Adding matching @deprecated.Ian Rogers2013-04-191-0/+1
* | | am 5e650cef: Merge "Expand invalidation rectangle when clipChildren == false"...Chet Haase2013-04-231-0/+6
|\ \ \
| * \ \ Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-devChet Haase2013-04-231-0/+6
| |\ \ \
| | * | | Expand invalidation rectangle when clipChildren == falseChet Haase2013-04-221-0/+6
* | | | | am f78ff07f: Merge "Fix concurrency issues when parceling StatusBarNotificati...Daniel Sandler2013-04-233-11/+54
|\| | | |
| * | | | Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb...Daniel Sandler2013-04-233-11/+54
| |\ \ \ \
| | * | | | Fix concurrency issues when parceling StatusBarNotifications.Daniel Sandler2013-04-223-11/+54
* | | | | | am edced26f: Merge "Add ContentValues & CursorWindow to framework.aidl" into ...Nick Pelly2013-04-232-0/+38
|\| | | | |
| * | | | | Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-devNick Pelly2013-04-232-0/+38
| |\ \ \ \ \
| | * | | | | Add ContentValues & CursorWindow to framework.aidlNick Pelly2013-04-232-0/+38
* | | | | | | am 5fe6e4c4: Merge "Rewrite input handling for native applications" into jb-m...Michael Wright2013-04-234-67/+179
|\| | | | | |
| * | | | | | Merge "Rewrite input handling for native applications" into jb-mr2-devMichael Wright2013-04-234-67/+179
| |\ \ \ \ \ \
| | * | | | | | Rewrite input handling for native applicationsMichael Wright2013-04-224-67/+179
* | | | | | | | am a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-devSvetoslav2013-04-231-5/+5
|\| | | | | | |
| * | | | | | | Merge "Making new node id APIs return strings." into jb-mr2-devSvetoslav2013-04-231-5/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Making new node id APIs return strings.Svetoslav2013-04-221-5/+5
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | am a4629b0b: Merge "JB MR2 == API 18." into jb-mr2-devDianne Hackborn2013-04-231-2/+2
|\| | | | | | |
| * | | | | | | Merge "JB MR2 == API 18." into jb-mr2-devDianne Hackborn2013-04-221-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | JB MR2 == API 18.Dianne Hackborn2013-04-221-2/+2
| | |/ / / / / /
* | | | | | | | am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to...Philip Milne2013-04-231-1/+6
|\| | | | | | |
| * | | | | | | Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView wid...Philip Milne2013-04-221-1/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgetsPhilip Milne2013-04-221-1/+6
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | am d0202945: Merge "Listen for network disconnect." into jb-mr2-devRobert Greenwalt2013-04-231-0/+2
|\| | | | | | |
| * | | | | | | Merge "Listen for network disconnect." into jb-mr2-devRobert Greenwalt2013-04-221-0/+2
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Listen for network disconnect.Robert Greenwalt2013-04-221-0/+2
| | |/ / / / /
* | | | | | | am abc2763e: Merge "KeyEvent: update comment"Michael Wright2013-04-201-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge "KeyEvent: update comment"Michael Wright2013-04-211-2/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | KeyEvent: update commentChirayu Desai2013-04-151-2/+2
* | | | | | | am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() se...Chet Haase2013-04-205-9/+9
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "Fix quickReject logic to account for setClipChildren() setting" into j...Chet Haase2013-04-205-9/+9
| |\ \ \ \ \ \
| | * | | | | | Fix quickReject logic to account for setClipChildren() settingChet Haase2013-04-195-9/+9
* | | | | | | | am 940718d8: am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404:...Selim Gurun2013-04-203-26/+7
|\| | | | | | |
| * | | | | | | am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654:...Selim Gurun2013-04-203-26/+7
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68:...Selim Gurun2013-04-203-26/+7
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4:...Selim Gurun2013-04-203-26/+7
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme...Selim Gurun2013-04-203-26/+7
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"Selim Gurun2013-04-203-26/+7
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ am 38915fd4: Revert "Add a delimiter between scheme and host"Selim Gurun2013-04-043-26/+7
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Revert "Add a delimiter between scheme and host"Selim Gurun2013-04-043-26/+7
| | * | | | | | | | | | | am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE...Geremy Condra2013-04-193-4/+24
| | |\| | | | | | | | | |
| | | * | | | | | | | | | am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit...Geremy Condra2013-04-193-4/+24
| | | |\| | | | | | | | |
| | | | * | | | | | | | | am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bpGeremy Condra2013-04-193-4/+24
| | | | |\| | | | | | | |
| | | | | * | | | | | | | DO NOT MERGE Merge commit '8225df00' into bpGeremy Condra2013-04-183-4/+24
| | | | | |\| | | | | | |
| | | | | | * | | | | | | am aa2163dd: Add a delimiter between scheme and hostSelim Gurun2013-04-033-7/+26
| | | | | | |\| | | | | |
| | | | | | | * | | | | | Add a delimiter between scheme and hostSelim Gurun2013-04-013-7/+26
* | | | | | | | | | | | | am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android....Fabrice Di Meglio2013-04-201-260/+13
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Fix bug #8656546 API REVIEW: android.text.bidi / android.textFabrice Di Meglio2013-04-191-260/+13
* | | | | | | | | | | | | am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for Backup...Christopher Tate2013-04-201-0/+48
|\| | | | | | | | | | | |