summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolve conflicts for merge 5a7b3b65 correctlyDeepanshu Gupta2014-05-121-1/+1
* resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aospDeepanshu Gupta2014-05-1227-443/+1820
|\
| * Remove references to non-std Java classes. [DO NOT MERGE]Deepanshu Gupta2014-05-0627-443/+1820
* | am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-131-2/+5
|\ \ | |/
| * Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-051-2/+5
* | am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]Deepanshu Gupta2014-05-138-7/+6
|\ \ | |/
| * Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]Deepanshu Gupta2014-05-058-7/+6
* | am 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE]Deepanshu Gupta2014-05-132-0/+62
|\ \ | |/
| * Fix CalendarView to show the right labels. [DO NOT MERGE]Deepanshu Gupta2014-05-052-0/+62
* | am 64dc0380: Fix layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-6/+15
|\ \ | |/
| * Fix layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-051-6/+15
* | am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]Deepanshu Gupta2014-05-134-129/+156
|\ \ | |/
| * Fix ClassCastException when rendering ListView [DO NOT MERGE]Deepanshu Gupta2014-05-054-129/+156
* | am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+18
|\ \ | |/
| * Add orientation to configuration for layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-051-0/+18
* | am ecb013db: Merge "Use hidden API to validate APK chains" into jb-devKenny Root2014-04-181-1/+1
|\ \ | |/
| * Merge "Use hidden API to validate APK chains" into jb-devKenny Root2014-04-181-1/+1
| |\
| | * Use hidden API to validate APK chainsKenny Root2014-04-171-1/+1
* | | am fe38ff8d: DO NOT MERGE Sanitize WifiConfigsRobert Greenwalt2014-04-074-0/+78
|\ \ \ | |/ /
| * | DO NOT MERGE Sanitize WifiConfigsRobert Greenwalt2014-03-284-0/+78
| |/
* | am a3337bc7: Merge "Verify certificates" into jb-devMarco Nelissen2014-03-202-0/+45
|\ \ | |/
| * Merge "Verify certificates" into jb-devMarco Nelissen2014-03-202-0/+45
| |\
| | * Verify certificatesMarco Nelissen2014-03-172-0/+45
* | | am 1c12f9e7: malloc some advancesVictoria Lease2014-03-191-1/+2
|\ \ \ | |/ /
| * | malloc some advancesVictoria Lease2014-03-181-1/+2
| |/
* | am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary ...Paul Lawrence2014-02-271-1/+24
|\ \ | |/
| * Prevent authenticators from using Settings to launch arbitrary activities.Paul Lawrence2014-02-271-1/+24
* | am 8e0c7768: DO NOT MERGE: Clear cached locations when location providers dis...David Christie2014-01-101-0/+4
|\ \ | |/
| * DO NOT MERGE: Clear cached locations when location providers disabledDavid Christie2014-01-061-0/+4
* | am 50cbfd55: System package permission decls take precedence over 3rd party a...Christopher Tate2013-11-081-0/+12
|\ \ | |/
| * System package permission decls take precedence over 3rd party apps'Christopher Tate2013-11-071-0/+12
* | am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiateAmith Yamasani2013-09-271-0/+4
|\ \ | |/
| * Don't instantiate non-Fragments in Fragment.instantiateAmith Yamasani2013-09-271-0/+4
* | am 32c99004: Use hostname verifier directly instead of instanceKenny Root2013-08-131-4/+1
|\ \ | |/
| * Use hostname verifier directly instead of instanceKenny Root2013-08-131-4/+1
* | am 81c1d8d3: Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
|\ \ | |/
| * Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
* | am 6d8f5b75: libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
|\ \ | |/
| * libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
* | am 93c39d5d: DO NOT MERGE Fix issues during backportSelim Gurun2013-04-051-3/+4
|\ \ | |/
| * DO NOT MERGE Fix issues during backportSelim Gurun2013-04-041-3/+4
* | am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and hostSelim Gurun2013-04-043-7/+26
|\ \ | |/
| * DO NOT MERGE Add a delimiter between scheme and hostSelim Gurun2013-04-043-7/+26
* | 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 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 0cb27e28: Validate restored file paths against their nominal domainChristopher Tate2013-03-251-9/+19
|\ \ | |/
| * Validate restored file paths against their nominal domainChristopher Tate2013-03-251-9/+19
* | am a2e929e1: Tighten enforcement of file modes.Jeff Sharkey2013-03-011-2/+2
|\ \ | |/