tree a5515f4a76d983bfb1ebb6577f1bebb64f45ff6f
parent a027e9c746ecbfb6ae16e4a1fb4ac8745f44906f
parent 056cf62bbb0edc46199b3791861caf4249da3ed5
author Sameer Padala <sxp@google.com> 1407786959 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407786959 +0000

am 056cf62b: Merge "Update code so it compiles on google3" into ub-now-porkchop

* commit '056cf62bbb0edc46199b3791861caf4249da3ed5':
  Update code so it compiles on google3