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:26 +0000 (09:52 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 10 Jun 2013 16:52:26 +0000 (09:52 -0700)
commitade881041ca2905b9fabc2105458e429e5f6a8c6
treed75e6412b13977851d555bc12e6b24cd7493d3ca
parentd72db32f84dbb07b3932321fe9cc101a597b6206
parent88d7d97466571b01bc3a4faa29140822fd2c0dc7
merge in master-release history after reset to master