OSDN Git Service

merge in master-release history after reset to 312c4573c3264914fa190e173a04abaca0507ce9
authorThe Android Automerger <android-build@google.com>
Thu, 1 May 2014 12:51:02 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 1 May 2014 12:51:02 +0000 (05:51 -0700)
commit1b28d6c05a60e0fdf940e2b861495bc6fa1b5faf
tree0190e615af2a28f016f4a4df255fd7dbcf47bfa3
parent312c4573c3264914fa190e173a04abaca0507ce9
parent59d4dfad0dc3891d54e41ea09bdad75e7454ef00
merge in master-release history after reset to 312c4573c3264914fa190e173a04abaca0507ce9