OSDN Git Service

am 96236bc8: (-s ours) am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed...
authorfelipeal <felipeal@google.com>
Tue, 28 Feb 2012 22:59:26 +0000 (14:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Feb 2012 22:59:26 +0000 (14:59 -0800)
commitd378afb3866662862d10b75cb279608d796d82fb
tree4ea6997ff3c07628f760bf7d6f9de00dcc6606a2
parent9f841a4f8f13e8b617843bf98698fbb326f84b11
parent35ef14c5e46ff8bfaa2391df989b08d194c8a1b4
am 96236bc8: (-s ours) am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)

* commit '96236bc8d93efc0573a18b87699d56a3ed8c0b0b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)