OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 8 Apr 2014 12:49:51 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 8 Apr 2014 12:49:51 +0000 (05:49 -0700)
commit6ef410a6ec1b5c7a9ffef0d481fbd289d9dc2a77
treeb41fd1b347cfb4633f2ffc8f19ca58e2cb113d92
parentfc9aeb859096cc02ec9241fad589d361cf9c3ddd
parent7e4e75cabb6a32ba672d7f8b3d4f8169db7924ef
merge in master-release history after reset to master