tree 515ab3c5450e1a156ccad2993a16a509bdfc8f69
parent 608a4731ca0f324043f11ca9d3b9c23a608023a3
parent 512031da67147e040f2da31cf30877d09898e311
author Dianne Hackborn <hackbod@google.com> 1369167843 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369167843 -0700

am 512031da: Further changes to API 18.

* commit '512031da67147e040f2da31cf30877d09898e311':
  Further changes to API 18.