OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Mon, 17 Jun 2013 14:51:24 +0000 (07:51 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 17 Jun 2013 14:51:24 +0000 (07:51 -0700)
commit33adaef12e00d0707d6b684aac36eda13d01f327
tree3987d9b6570f61c4ab9d0f3f024787f89dd2b6c1
parentd55de16354701c21579b7675ea0017f6b32fc355
parenta9edc7091912b98e6a52be700224fc3a49aa1a79
merge in master-release history after reset to master