OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 2 Apr 2013 16:18:02 +0000 (09:18 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 2 Apr 2013 16:18:02 +0000 (09:18 -0700)
commitb72e9919c1a0fbf7e9300f2acbfbda380ed8b063
tree0717b4012583ecf27dd0adc6d490522ccbb6f75e
parentae411c7fac0cdfb34f1cd0617bbc219527c811eb
parent9831041a0ec9fc39932e152a32eaed1974fb7fc1
merge in master-release history after reset to master