OSDN Git Service

am 164bd217: am 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072a4: Merge "Import...
authorJustin Ho <justinho@google.com>
Fri, 10 Feb 2012 18:25:00 +0000 (10:25 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:25:00 +0000 (10:25 -0800)
* commit '164bd217f574f68e9f3b03ed59b34842cacf4ca5':


Trivial merge