diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-28 19:38:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-28 19:38:17 +0000 |
| commit | cc619e2eca624d293e0e7f65f82305a5d925dbf7 (patch) | |
| tree | fe9ed94353b09dda232fceb64691f96dcd5db8d3 /src/com/android/launcher3/widget/WidgetCell.java | |
| parent | 9486780029868bc04e2bd2f2c2ed34283fa2d25d (diff) | |
| parent | 6ce4ac13964e2ecb852dba5c2cf35c55929f8fc7 (diff) | |
| download | android_packages_apps_Trebuchet-cc619e2eca624d293e0e7f65f82305a5d925dbf7.tar.gz android_packages_apps_Trebuchet-cc619e2eca624d293e0e7f65f82305a5d925dbf7.tar.bz2 android_packages_apps_Trebuchet-cc619e2eca624d293e0e7f65f82305a5d925dbf7.zip | |
am 6ce4ac13: am e6127759: resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
* commit '6ce4ac13964e2ecb852dba5c2cf35c55929f8fc7':
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
Diffstat (limited to 'src/com/android/launcher3/widget/WidgetCell.java')
0 files changed, 0 insertions, 0 deletions