tree 7965a18c08d0a15a0d7a8d950189c29e6de1f9b3
parent 9f16f030f157e3987f63b16be2c26499b84eee22
parent d1129ccbc225ff5658e0ff883d8f18b2711e9de6
author Stephen Hines <srhines@google.com> 1408752752 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408752752 +0000

am d1129ccb: Merge "Update Galaxy to use API level 14 to prepare for 64-bit compiles."

* commit 'd1129ccbc225ff5658e0ff883d8f18b2711e9de6':
  Update Galaxy to use API level 14 to prepare for 64-bit compiles.