tree 8a8fc75747a5cf7df5c11ff1600baf6a2c6059af
parent 0e8d12cb0c79c51ef25922551264a2eb378984a9
parent 26120ff4bfa8f00ef967deaf3e0ff88b09646329
author Conley Owens <cco3@android.com> 1389654241 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389654241 +0000

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

* commit '26120ff4bfa8f00ef967deaf3e0ff88b09646329':