summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | * | | | | | Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-03-281-3/+5
| | | | | | | | |/ / / / /
* | | | | | | | | | | | | am 43e229a1: (-s ours) am 38f2b1ea: am 30ab17dd: am 289f1ffb: am 90b0b69c: (-...Deepanshu Gupta2014-04-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 38f2b1ea: am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am...Deepanshu Gupta2014-04-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Me...Deepanshu Gupta2014-04-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize...Deepanshu Gupta2014-04-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rende...Deepanshu Gupta2014-04-160-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | | | * | | | | | | | am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO N...Deepanshu Gupta2014-04-161-2/+2
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" in...Deepanshu Gupta2014-04-161-2/+2
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / /
| | | | | | | * | | | | | Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-devDeepanshu Gupta2014-04-161-2/+2
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | Optimize layout rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-03-281-2/+2
| | | | | | | | |/ / / / /
* | | | | | | | | | | | | Merge "Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event"Wink Saville2014-04-167-1/+243
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen eventWink Saville2014-04-157-1/+243
* | | | | | | | | | | | | | Merge "Remove activitystrings.xml from localized resource directories"Baligh Uddin2014-04-1645-1620/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove activitystrings.xml from localized resource directoriesBaligh Uddin2014-04-1645-1620/+0
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | am 492090a5: (-s ours) am 16191f8c: resolved conflicts for merge of 0e2049cd ...Deepanshu Gupta2014-04-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-devDeepanshu Gupta2014-04-163-5/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | resolved conflicts for merge of 0e2049cd to klp-modular-devDeepanshu Gupta2014-04-163-5/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am bdd0ad79: Layoutlib tests now check methods return value [DO NOT MERGE]Deepanshu Gupta2014-04-163-5/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Layoutlib tests now check methods return value [DO NOT MERGE]Deepanshu Gupta2014-04-153-5/+15
* | | | | | | | | | | | | | am 35d46778: (-s ours) resolved conflicts for merge of ec6676dd to klp-modula...Deepanshu Gupta2014-04-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aospDeepanshu Gupta2014-04-165-14/+155
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-165-14/+155
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-165-14/+155
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-155-14/+155
* | | | | | | | | | | | | | Merge "Stub APIs for network scoring."Jeff Davidson2014-04-165-0/+165
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Stub APIs for network scoring.Jeff Davidson2014-04-165-0/+165
* | | | | | | | | | | | | | | am 82d5f137: (-s ours) am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu p...Deepanshu Gupta2014-04-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in ...Deepanshu Gupta2014-04-166-93/+399
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO...Deepanshu Gupta2014-04-166-93/+399
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-166-93/+399
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-156-93/+399
* | | | | | | | | | | | | | | am f2d085e8: (-s ours) am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rend...Deepanshu Gupta2014-04-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO ...Deepanshu Gupta2014-04-1612-150/+445
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-1612-150/+445
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-1612-150/+445
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-1512-150/+445
* | | | | | | | | | | | | | | am 110a05c6: (-s ours) am 2aee0712: am e75477cb: am acf0bce0: Support custom ...Deepanshu Gupta2014-04-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | / / / / / / / / / / | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerD...Deepanshu Gupta2014-04-161-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT...Deepanshu Gupta2014-04-161-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]Deepanshu Gupta2014-04-161-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Support custom views using TimePickerDialog [DO NOT MERGE]Deepanshu Gupta2014-04-151-0/+1
* | | | | | | | | | | | | | Merge "Data structures for communication with network scorer apps."Jeff Davidson2014-04-168-0/+639
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Data structures for communication with network scorer apps.Jeff Davidson2014-04-168-0/+639
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Implement jumpToCurrentState() in VectorDrawable"Alan Viverette2014-04-161-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Implement jumpToCurrentState() in VectorDrawableAlan Viverette2014-04-151-0/+5
* | | | | | | | | | | | | | | Merge "Rename basePkg to opPkg"Christoph Studer2014-04-169-52/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Rename basePkg to opPkgChristoph Studer2014-04-169-52/+47
* | | | | | | | | | | | | | | | Merge "Fixing the alternate recents transition on landscape views."Winson Chung2014-04-162-19/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixing the alternate recents transition on landscape views.Winson Chung2014-04-162-19/+50
* | | | | | | | | | | | | | | | Merge "Revert "Import translations. DO NOT MERGE""Baligh Uddin2014-04-1656-84/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \