summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | am 8e11659a: Change font family name. [DO NOT MERGE]Deepanshu Gupta2014-07-082-49/+120
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Change font family name. [DO NOT MERGE]Deepanshu Gupta2014-07-072-49/+120
* | | | | | | | | | | | | am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]Deepanshu Gupta2014-06-184-0/+207
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]Deepanshu Gupta2014-06-184-0/+207
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Add a script to rename fonts for SDK. [DO NOT MERGE]Deepanshu Gupta2014-06-124-0/+207
* | | | | | | | | | | | | LayoutLib fixes for API 20 [DO NOT MERGE]Deepanshu Gupta2014-06-128-22/+44
* | | | | | | | | | | | | am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2:...Deepanshu Gupta2014-06-041-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e:...Deepanshu Gupta2014-06-041-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247:...Deepanshu Gupta2014-06-041-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5:...Deepanshu Gupta2014-06-041-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120:...Deepanshu Gupta2014-06-041-0/+1
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | | | * | | | | | | | am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved con...Deepanshu Gupta2014-06-041-0/+1
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for me...Deepanshu Gupta2014-06-041-0/+1
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / /
| | | | | | | * | | | | | am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-devDeepanshu Gupta2014-06-041-0/+1
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | |/ / / / | | | | | | | | |/| | | |
| | | | | | | | * | | | | am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-devDeepanshu Gupta2014-06-043-34/+55
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | |/ / / | | | | | | | | | |/| | |
| | | | | | | | | * | | | resolved conflicts for merge of 61fb5784 to jb-mr1-devDeepanshu Gupta2014-06-043-34/+55
| | | | | | | | | |\ \ \ \ | | | | | | | | | | | |/ / | | | | | | | | | | |/| |
| | | | | | | | | | * | | am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE]Deepanshu Gupta2014-06-043-34/+55
| | | | | | | | | | |\ \ \ | | | | | | | | | | | | |/ | | | | | | | | | | | |/|
| | | | | | | | | | | * | Distinguish between menus in ActionBar and popup. [DO NOT MERGE]Deepanshu Gupta2014-05-303-34/+55
| | | | | | | | * | | | | am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo...Deepanshu Gupta2014-06-031-1/+1
| | | | | | | | |\ \ \ \ \ | | | | | | | | | |/ / / /
| | | | | | | | | * | | | am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-06-031-1/+1
| | | | | | | | | |\ \ \ \ | | | | | | | | | | |/ / /
| | | | | | | | | | * | | am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-06-031-1/+1
| | | | | | | | | | |\ \ \ | | | | | | | | | | | |/ /
| | | | | | | | | | | * | LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-05-301-1/+1
| | | | | | | | * | | | | am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]Deepanshu Gupta2014-05-131-13/+7
| | | | | | | | |\ \ \ \ \ | | | | | | | | | |/ / / /
| | | | | | | | | * | | | Fix build due to incorrect merges [DO NOT MERGE]Deepanshu Gupta2014-05-131-13/+7
| | | | | * | | | | | | | am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in Ac...Deepanshu Gupta2014-06-043-34/+55
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and p...Deepanshu Gupta2014-06-043-34/+55
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / /
| | | | | | | * | | | | | Distinguish between menus in ActionBar and popup. [DO NOT MERGE]Deepanshu Gupta2014-05-303-34/+55
| | | | | * | | | | | | | am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo...Deepanshu Gupta2014-06-031-1/+1
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-06-031-1/+1
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / /
| | | | | | | * | | | | | LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-05-301-1/+1
| | | | | * | | | | | | | am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]Deepanshu Gupta2014-06-031-12/+10
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]Deepanshu Gupta2014-06-031-12/+10
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / /
| | | | | | | * | | | | | Remove @NonNull attribute [DO NOT MERGE]Deepanshu Gupta2014-05-301-12/+10
| | | | | | | | |_|_|_|/ | | | | | | | |/| | | |
| | | * | | | | | | | | am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and p...Deepanshu Gupta2014-06-043-34/+55
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Distinguish between menus in ActionBar and popup. [DO NOT MERGE]Deepanshu Gupta2014-05-303-34/+55
| | | * | | | | | | | | am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-06-031-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-05-301-1/+1
* | | | | | | | | | | | am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-andr...Deepanshu Gupta2014-06-043-34/+55
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesou...Deepanshu Gupta2014-06-043-34/+55
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Distinguish between menus in ActionBar and popup. [DO NOT MERGE]Deepanshu Gupta2014-05-303-34/+55
* | | | | | | | | | | | Merge "Force all windows to redraw before unblanking screen" into klp-modular...Craig Mautner2014-06-031-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Force all windows to redraw before unblanking screenCraig Mautner2014-06-021-5/+0
* | | | | | | | | | | | | am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-06-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
| * | | | | | | | | | | am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-06-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-05-301-1/+1
* | | | | | | | | | | | Fix build.Jeff Brown2014-05-201-1/+1
* | | | | | | | | | | | am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721:...Deepanshu Gupta2014-05-141-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3:...Deepanshu Gupta2014-05-141-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a:...Deepanshu Gupta2014-05-141-1/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445:...Deepanshu Gupta2014-05-141-1/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /