OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Mon, 7 Oct 2013 14:52:23 +0000 (07:52 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 7 Oct 2013 14:52:23 +0000 (07:52 -0700)
commit73435986a75eda3a2af431e773932923c9f67002
tree2960accfae8c2b7accb672df3724a013f98b1510
parentee63519d2a893a59f10cd8b29bec9e3006edc486
parent8829f7cc5c72afc28944d65a1c3bf3fd6129231a
merge in master-release history after reset to master