tree aa3dd19fbf0715085236fc593d09cf34cb0f073e
parent c7215b160038ad44cecd163f551b4e60d655d729
parent 5f380611d29cb4bdd78ac1c0a2f63912de452567
author Kenny Root <kroot@google.com> 1379002929 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379002929 -0700

am 5f380611: am 94517894: Merge "Use canonical UniquePtr.h file"

* commit '5f380611d29cb4bdd78ac1c0a2f63912de452567':
  Use canonical UniquePtr.h file