tree 8b5117993d4e8d4034af43fc449b131c6786a3de
parent f30ea36c3bd07ebbcef0f80c8c92a05a7384d319
parent c88702e49917a21b9753d587800de25f87f2c5a8
author Jay Shrauner <shrauner@google.com> 1376082132 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376082132 -0700

am 30d26326: Add directory photo support

* commit '30d26326568cb888430468370df6f6ab2ec12767':
  Add directory photo support