OSDN Git Service

merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
authorThe Android Automerger <android-build@google.com>
Tue, 13 May 2014 12:50:33 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 13 May 2014 12:50:33 +0000 (05:50 -0700)
commit2830a30ef42f16774f431ff14898ae084d85bcfc
treee9c1e4edb66d2210b0c038b2d2390519401b1a6f
parent38a3f7de2450fcffd4bd88cc869329f3d17a9996
parent55dc5b86945fcf300bf19ebd16706db9fd7a77e0
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996