tree d94f5455cc8f1c29348a5564b6b93f2612b9befa
parent 08fffcb459f06b13161d0815ef52b5c06166d4c3
parent d643f05035bfbe30b199f1611b2142b8299df30a
author Andrew Hsieh <andrewhsieh@google.com> 1395664422 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395664422 +0000

am d643f050: Merge "Update 64-bit headers/libs"

* commit 'd643f05035bfbe30b199f1611b2142b8299df30a':
  Update 64-bit headers/libs