OSDN Git Service

merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
authorThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:22:11 +0000 (07:22 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:22:11 +0000 (07:22 -0700)
commit18fc0f46d6ef4fe3000ddf7928ee19e1e214e2fa
treee9c1e4edb66d2210b0c038b2d2390519401b1a6f
parent38a3f7de2450fcffd4bd88cc869329f3d17a9996
parentad0728163ea57a6f0e008bc3516b98bf9120ce9f
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996