OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sat, 19 Apr 2014 12:50:02 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 19 Apr 2014 12:50:02 +0000 (05:50 -0700)
commit2ca329db2459a7f584444f3e50eebdecd78f7ab3
tree511b67a742dcc45fa1e7d7932cb9275069e56fae
parent6adc9ccb2948d9421a0ed4b74f52b909bcec2037
parentf4d79ec720819a3a3713d287827b9488b81783c0
merge in master-release history after reset to master