Gitiles
Code Review Sign In
review.blissroms.org / platform_packages_apps_Launcher3 / f5247179d6b223f17b25c5f4671a1c60cfac6610
commitf5247179d6b223f17b25c5f4671a1c60cfac6610[log] [tgz]
authorHyunyoung Song <hyunyoungs@google.com>Thu May 11 15:15:43 2017 +0000
committerandroid-build-merger <android-build-merger@google.com>Thu May 11 15:15:43 2017 +0000
tree001a6636ce1d55bd2e31ea69aa4ed2202591795d
parent7a8295e0d6908fb666b91ce3e1f83653ac7ee2f6 [diff]
parent89e26d6cf46532553888630a467310efcba77d59 [diff]
merged ub-launcher3-dorval, and resolved conflicts Bug: 36904684 Bug: 37929893 Bug: 36068989 am: 93d0b87153  -s ours
am: 89e26d6cf4

Change-Id: I558a1df55dc0b5936071b4ab7ec2789a449cecc3
tree: 001a6636ce1d55bd2e31ea69aa4ed2202591795d
  1. protos/
  2. res/
  3. src/
  4. src_config/
  5. tests/
  6. .gitignore
  7. Android.mk
  8. AndroidManifest-common.xml
  9. AndroidManifest.xml
  10. build.gradle
  11. CleanSpec.mk
  12. fill_screens.py
  13. MODULE_LICENSE_APACHE2
  14. NOTICE
  15. print_db.py
  16. proguard.flags