OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 22 Apr 2014 12:50:46 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 22 Apr 2014 12:50:46 +0000 (05:50 -0700)
commit3d24dcd5dc06df1c46fb30f4424b94ee18fe8e4b
treeaaa86e5af7aec777c4e010bcdd45aec774d9b0b8
parentf640f5bf47ee1bcd3d21d954024c823e9f221512
parenta0d0877f0c305243d8e3e9e9c34d13cae7fe2e60
merge in master-release history after reset to master