OSDN Git Service

merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
authorThe Android Automerger <android-build@google.com>
Thu, 15 May 2014 12:50:57 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 15 May 2014 12:50:57 +0000 (05:50 -0700)
commit8e9e96040a0d135a4069410c3c5cc7be4ffb0968
treee9c1e4edb66d2210b0c038b2d2390519401b1a6f
parent38a3f7de2450fcffd4bd88cc869329f3d17a9996
parent731a6ba008bd5804bd448a1db1046f1a1e0273a2
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996