| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for me... | Deepanshu Gupta | 2014-08-06 | 3 | -49/+107 |
| |\ | |||||
| | * | am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a6... | Deepanshu Gupta | 2014-08-06 | 3 | -49/+107 |
| | |\ | |||||
| | | * | am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs | Deepanshu Gupta | 2014-08-06 | 3 | -49/+107 |
| | | |\ | |||||
| | | | * | resolved conflicts for merge of a232a68d to jb-mr1.1-docs | Deepanshu Gupta | 2014-08-06 | 3 | -49/+107 |
| | | | |\ | |||||
| | | | | * | resolved conflicts for merge of 5476cfee to jb-mr1-dev | Deepanshu Gupta | 2014-08-06 | 3 | -49/+107 |
| | | | | |\ | |||||
| | | | | | * | am 505c675c: Fix SystemProperties in LayoutLib. | Deepanshu Gupta | 2014-08-06 | 3 | -49/+107 |
| | | | | | |\ | |||||
| | | | | | | * | Fix SystemProperties in LayoutLib. | Deepanshu Gupta | 2014-08-05 | 3 | -49/+107 |
| | | | * | | | | am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \... | Deepanshu Gupta | 2014-07-18 | 1 | -10/+7 |
| | | | |\ \ \ \ | | | | |/ / / | |||||
| | | | | * | | | am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT ... | Deepanshu Gupta | 2014-07-18 | 1 | -10/+7 |
| | | | | |\ \ \ | | | | | |/ / | |||||
| | | | | | * | | am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] | Deepanshu Gupta | 2014-07-18 | 1 | -10/+7 |
| | | | | | |\ \ | | | | | | |/ | |||||
| | | | | | | * | Fix style resolution for styles with '.' [DO NOT MERGE] | Deepanshu Gupta | 2014-07-10 | 1 | -10/+7 |
| * | | | | | | | am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles... | Deepanshu Gupta | 2014-07-18 | 1 | -10/+7 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [... | Deepanshu Gupta | 2014-07-18 | 1 | -10/+7 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1... | Deepanshu Gupta | 2014-07-17 | 1 | -10/+7 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Fix style resolution for styles with '.' [DO NOT MERGE] | Deepanshu Gupta | 2014-07-10 | 1 | -10/+7 |
| * | | | | | | | | am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO ... | Deepanshu Gupta | 2014-07-18 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] | Deepanshu Gupta | 2014-07-18 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Fix default level flags for bidi. [DO NOT MERGE] | Deepanshu Gupta | 2014-07-12 | 1 | -2/+2 |
| | | |/ / / / / | |||||
| * | | | | | | | am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] | Deepanshu Gupta | 2014-07-08 | 2 | -49/+120 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] | Deepanshu Gupta | 2014-07-08 | 2 | -49/+120 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Change font family name. [DO NOT MERGE] | Deepanshu Gupta | 2014-07-08 | 2 | -49/+120 |
| * | | | | | | | am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts fo... | Deepanshu Gupta | 2014-07-08 | 4 | -0/+207 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NO... | Deepanshu Gupta | 2014-07-08 | 4 | -0/+207 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev | Deepanshu Gupta | 2014-07-08 | 4 | -0/+207 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Add a script to rename fonts for SDK. [DO NOT MERGE] | Deepanshu Gupta | 2014-06-12 | 4 | -0/+207 |
| * | | | | | | | | am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved con... | Deepanshu Gupta | 2014-06-04 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for me... | Deepanshu Gupta | 2014-06-04 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev | Deepanshu Gupta | 2014-06-04 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | | * | | | | | am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev | Deepanshu Gupta | 2014-06-04 | 3 | -34/+55 |
| | | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | | * | | | | resolved conflicts for merge of 61fb5784 to jb-mr1-dev | Deepanshu Gupta | 2014-06-04 | 3 | -34/+55 |
| | | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| | | | | | * | | | am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] | Deepanshu Gupta | 2014-06-04 | 3 | -34/+55 |
| | | | | | |\ \ \ | | | | | | | |/ | | | | | | |/| | |||||
| | | | | | | * | | Distinguish between menus in ActionBar and popup. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-30 | 3 | -34/+55 |
| | | | * | | | | | am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo... | Deepanshu Gupta | 2014-06-03 | 1 | -1/+1 |
| | | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | | * | | | | am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] | Deepanshu Gupta | 2014-06-03 | 1 | -1/+1 |
| | | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | | * | | | am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] | Deepanshu Gupta | 2014-06-03 | 1 | -1/+1 |
| | | | | | |\ \ \ | | | | | | |/ / | |||||
| | | | | | | * | | LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] | Deepanshu Gupta | 2014-05-30 | 1 | -1/+1 |
| | | | * | | | | | am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -13/+7 |
| | | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | | * | | | | Fix build due to incorrect merges [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -13/+7 |
| * | | | | | | | | am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in Ac... | Deepanshu Gupta | 2014-06-04 | 3 | -34/+55 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and p... | Deepanshu Gupta | 2014-06-04 | 3 | -34/+55 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Distinguish between menus in ActionBar and popup. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-30 | 3 | -34/+55 |
| * | | | | | | | | am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo... | Deepanshu Gupta | 2014-06-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] | Deepanshu Gupta | 2014-06-03 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] | Deepanshu Gupta | 2014-05-30 | 1 | -1/+1 |
| * | | | | | | | | am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] | Deepanshu Gupta | 2014-06-03 | 1 | -12/+10 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] | Deepanshu Gupta | 2014-06-03 | 1 | -12/+10 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Remove @NonNull attribute [DO NOT MERGE] | Deepanshu Gupta | 2014-05-30 | 1 | -12/+10 |
| | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | | am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build | Deepanshu Gupta | 2014-05-14 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build | Deepanshu Gupta | 2014-05-13 | 1 | -1/+0 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | am f266873c: am 1c55797d: Fix build | Deepanshu Gupta | 2014-05-13 | 1 | -1/+0 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |