OSDN Git Service

merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
authorThe Android Automerger <android-build@google.com>
Sun, 11 May 2014 12:49:55 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 11 May 2014 12:49:55 +0000 (05:49 -0700)
commitf88f3206ce063e80e9efce3501a97a31f1b48ccc
treee9c1e4edb66d2210b0c038b2d2390519401b1a6f
parent38a3f7de2450fcffd4bd88cc869329f3d17a9996
parentd9b37566b14740ee7d34e82ea0924a5120a25048
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996