tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 2c93d7b6d6dc5a3b0b241b84d5d9f599fe9909bd
parent 5af04b6bc91130e6ec3a38e2590571fcf13bccfa
author Helena Josol <helenajosol@google.com> 1422685379 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685379 +0000

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

* commit '5af04b6bc91130e6ec3a38e2590571fcf13bccfa':