OSDN Git Service

Merge "no-op"
authorJean-Baptiste Queru <jbq@google.com>
Thu, 10 Feb 2011 20:58:01 +0000 (12:58 -0800)
committerAndroid Code Review <code-review@android.com>
Thu, 10 Feb 2011 20:58:01 +0000 (12:58 -0800)
commit8f9849a037c901ea3b1e7a1d7d43f56728abea40
treee58d9b3484580ae44573b9ff42114d82412096be
parent6b7b53cb36bda3b2aa1de94654cd73785d67c267
parentc13cf1919fb9aee316897d4aa67d718c067e2275
Merge "no-op"