OSDN Git Service

merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
authorThe Android Automerger <android-build@google.com>
Wed, 21 May 2014 12:50:27 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 21 May 2014 12:50:27 +0000 (05:50 -0700)
commita5765fd42f4b57d5a4d9360106d648cc3baf34de
treee9c1e4edb66d2210b0c038b2d2390519401b1a6f
parent38a3f7de2450fcffd4bd88cc869329f3d17a9996
parent35b72433a75016d7a8e87940e916ca2ede9df5f2
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996