OSDN Git Service

am 635d492d: (-s ours) am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed...
authorfelipeal <felipeal@google.com>
Tue, 28 Feb 2012 22:59:29 +0000 (14:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Feb 2012 22:59:29 +0000 (14:59 -0800)
* commit '635d492d5918fe11a3a9bb9d9a87839a8331d34b':


Trivial merge