OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Thu, 27 Mar 2014 12:50:40 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 27 Mar 2014 12:50:40 +0000 (05:50 -0700)
commitd8a35d9b7b8ec0a1d824bba2d28a4890c730ce84
treeac9357ee7fea157e1727c7066697ba3f8c36db55
parentc96ccc8585b10b56f34744473a75b8ff5e6115aa
parentef75a081c14c9d84573dc5ffe85d2fa0c2ac7735
merge in master-release history after reset to master