OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Mon, 10 Jun 2013 16:52:43 +0000 (09:52 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 10 Jun 2013 16:52:43 +0000 (09:52 -0700)
commitb0ac1f3441f90f1171acd9c98fdfc715c736ece0
treefe57802e5398925cf0b08acbcc164156adf44817
parent1eae0ee49402c39f1b08cc8fec129023f86494b7
parent33e59ba84895a4ec6a26f8e1330fe0116bbed36d
merge in master-release history after reset to master