tree ba447957494b4bb020cc4537cf1514d582dfcd2d
parent ad29afab5e0c08f2459c5f97a79dbad3c395bc9b
parent f4eaaadb8cb0e2ff8d1704827883b5a62173311d
author Christopher Ferris <cferris@google.com> 1410022961 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410022961 +0000

am f4eaaadb: Merge "Fix use of %llx for sscanf 64 bit values."

* commit 'f4eaaadb8cb0e2ff8d1704827883b5a62173311d':
  Fix use of %llx for sscanf 64 bit values.