OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Fri, 6 Sep 2013 18:31:38 +0000 (11:31 -0700)
committerThe Android Automerger <android-build@google.com>
Fri, 6 Sep 2013 18:31:38 +0000 (11:31 -0700)
commit048d937d4a2d218abe431b303f5cd58511e5e952
tree0014b5f1f571694c3b362a2ad3929551644a302a
parent149930f673bd1cd0df61d4cd64213f38f61f7299
parent41a44358d38226d18e99b1f540f98bf4fba48fa8
merge in master-release history after reset to master