OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 9 Apr 2014 12:49:52 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 9 Apr 2014 12:49:52 +0000 (05:49 -0700)
commit83c2acb9f984505a227067d18ef5559ecd9b76e8
treea5848980971df8f8daa310ef576efab77e1ad923
parentfb9bf8725d682568fb509e2dac0587fa4e493572
parent6ef410a6ec1b5c7a9ffef0d481fbd289d9dc2a77
merge in master-release history after reset to master