diff options
| author | Winson Chung <winsonc@google.com> | 2015-06-18 14:26:10 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2015-06-18 21:27:30 +0000 |
| commit | 7b933a5ef764d4716177dc7f060af823a38fa628 (patch) | |
| tree | c8cfbbb455b7ff26e1d48fccea8e148b09fb6fd7 /res/layout | |
| parent | d3800208aa8c4f5926502ccb8e49e13501b441c9 (diff) | |
| parent | 78564d4e2ddb4f8aba481b6943c155e121b41a7f (diff) | |
| download | android_packages_apps_Trebuchet-7b933a5ef764d4716177dc7f060af823a38fa628.tar.gz android_packages_apps_Trebuchet-7b933a5ef764d4716177dc7f060af823a38fa628.tar.bz2 android_packages_apps_Trebuchet-7b933a5ef764d4716177dc7f060af823a38fa628.zip | |
resolved conflicts for merge of 78564d4e to ub-launcher3-burnaby
Change-Id: I9e302b223dff1f238d720026e20b64315b61b293
Diffstat (limited to 'res/layout')
0 files changed, 0 insertions, 0 deletions