tree 2c8eda54586de336277b861c8e13f8e179b06b9b
parent aa8e3eb7a1cfcfc2c3c54e475a942fdd5b5b765c
parent a530b688ce6e5b61e7cea8dc500fd2642ccdb82c
author Alan Newberger <alann@google.com> 1412025277 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412025277 +0000

am a530b688: Merge "WIP: Add recursive thumbnail call to LocalMediaData" into ub-camera-glacier

* commit 'a530b688ce6e5b61e7cea8dc500fd2642ccdb82c':
  WIP: Add recursive thumbnail call to LocalMediaData