tree 903a12b1e194fbf6798a711b057f9e30e04ec228
parent 4f0728f9df2d91c39188ed0c149fd4c2bc5f16f7
parent 9b090b41e514abc72cf8bb8552f6f19ee3b4d03a
author Conley Owens <cco3@android.com> 1381335176 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381335176 -0700

am 9b090b41: am e39f2cd1: am 08b62a9d: Merge "Remove extraneous text about Ubuntu 12.04"

* commit '9b090b41e514abc72cf8bb8552f6f19ee3b4d03a':
  Remove extraneous text about Ubuntu 12.04