tree cd46dd4c8701b0df404fbf0fa90ff70acb6fce3c
parent 23abbfbb814501b825edc056027270f03f39506b
parent 9b0f4be0a20ee48a3ddf56438e846231955bd557
author Narayan Kamath <narayan@google.com> 1390936560 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390936560 -0800

am 9b0f4be0: Merge "Track 64bit changes to android/graphics."

* commit '9b0f4be0a20ee48a3ddf56438e846231955bd557':
  Track 64bit changes to android/graphics.