OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Mon, 20 May 2013 14:50:23 +0000 (07:50 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 20 May 2013 14:50:23 +0000 (07:50 -0700)
commit49675151de5c3c7a5e482deb8d7f75099d139465
treebc3edafb310b99cf7f27d1cc5afa8849cc7b32d0
parentcb5368356eaa169a79d6c7d315fae8b371a41b50
parent4f83f17baaefcefe98abfc7876b293e1b2513af1
merge in master-release history after reset to master