OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 16 Apr 2014 12:50:36 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 16 Apr 2014 12:50:36 +0000 (05:50 -0700)
commitf1f2c35133df70327afa2513566a486399b68002
treeda54fc69a98653acc05ed30a145dc2647982b4bb
parentdd306d43ed38550cfdbef66402d7fa3de5ba3a23
parentf8fb58c12b17527de9897c740b4504eab5384490
merge in master-release history after reset to master