OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 19 Mar 2013 14:49:39 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 19 Mar 2013 14:49:39 +0000 (07:49 -0700)
commit781d33e639f81d51a42fd2b1e5ca1454643747ac
tree0d85a34faf2b848e8851fdf0cc132ee840a1d4e4
parenta4c8323e15cb419a43aedab3f5d8d495d241bf90
parentdb5a7b9884d4d0a4da874ce4399cd95ac2ad184c
merge in master-release history after reset to master