OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Fri, 2 Nov 2012 14:49:13 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 2 Nov 2012 14:49:13 +0000 (07:49 -0700)
commit80bcf547664fa807f5c2c34471582420cc6bd241
tree136e043e30698bf2b692a5f4e8510f9fb84ef400
parenteb15e1d4852e6c4aa42bc285323f4804f9630d4d
parent7a6ae1d6674c00de19edbbc83f11711b60cd6c1e
merge in master-release history after reset to master