tree f41886a3d2938cd0acf89cf61cd249eb6f5f8b3b
parent cb990b0f55902ffa68040eb0c8d8366c13bd01ba
parent 97c177471e95bda94b3409afb0f8d105c432866a
author Stephen Hines <srhines@google.com> 1408954902 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408954902 +0000

am 97c17747: am 7c3213da: Merge "Switch to API level 17 so that NoiseField can build."

* commit '97c177471e95bda94b3409afb0f8d105c432866a':
  Switch to API level 17 so that NoiseField can build.