tree c75d197328351a1ff20dc636740ff0f26b2eb3a9
parent 74971669995e72cfb8f9c25329adb73ed2bb91da
parent 58acf11fbc36338b0664837de4007ad1f467ad23
author Helena Josol <helenajosol@google.com> 1422669745 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669745 +0000

am 58acf11f: am b2331f66: Merge "Create a central list of files the Launcher writes to the app directory" into ub-now-queens

* commit '58acf11fbc36338b0664837de4007ad1f467ad23':
  Create a central list of files the Launcher writes to the app directory