tree 7f559da6cd6a3853330d86a9880f3276a09fd11b
parent e4bab960c4b567ff6672a892c5c8325c0e4eda76
parent 9560bb3e388e3e9f76a5a8027a45f34c7cb8380c
author Conley Owens <cco3@android.com> 1389653644 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389653644 -0800

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

* commit '9560bb3e388e3e9f76a5a8027a45f34c7cb8380c':