OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 2 Apr 2014 12:49:24 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 2 Apr 2014 12:49:24 +0000 (05:49 -0700)
commit1c77dac8b5e105d99e255fc9cf84d60464d89cc0
tree2f1042217f428448443073123e389bc9ecb04727
parent797741adcacf8919f71d4da3e13d64f5ed19d427
parent9a34013256acc79e63131336cbe5ee701f5692b5
merge in master-release history after reset to master