tree 4eaea9644bf77ff604307f8c30f5ea20a5cb356c
parent b4b878d8c5570c5ad5dfaf6df55a5467b72d35ef
parent 42a74e320ad378472685526b0d84e3e1f443d6ad
author Jean-Baptiste Queru <jbq@google.com> 1329254546 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329254546 -0800

am 42a74e32: am 9345b458: Merge "Add notes about building on Ubuntu 12.04"

* commit '42a74e320ad378472685526b0d84e3e1f443d6ad':
  Add notes about building on Ubuntu 12.04