OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Thu, 10 Apr 2014 12:50:05 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 10 Apr 2014 12:50:05 +0000 (05:50 -0700)
commit454a43f56c2aa2d87a3290fa8b4e5cf733627762
tree04484e81c7d10570cbfb820ffe0cd199c45107c6
parent4cd47b2e0eac8eb1c4a9d69e716e6dc0e2da7227
parent83c2acb9f984505a227067d18ef5559ecd9b76e8
merge in master-release history after reset to master