OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 4 Feb 2014 13:50:19 +0000 (05:50 -0800)
committerThe Android Automerger <android-build@google.com>
Tue, 4 Feb 2014 13:50:19 +0000 (05:50 -0800)
commita4407777d8968e2aca2f04bc329f2f7d14b8b85e
treedc8fd51052ac94e418473d378c1244cb42594665
parent263bcc8b732dbb47d3ce63904e0e05191fabbad6
parentcd7ded405bd1ebaf987d8a50b983d7e19767f14a
merge in master-release history after reset to master