OSDN Git Service

merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
authorThe Android Automerger <android-build@google.com>
Tue, 6 May 2014 12:50:31 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 6 May 2014 12:50:31 +0000 (05:50 -0700)
commite446ae5b12ce384a6a1ea383201bf9679699bdbe
tree9dfc881b282514aa942b29dfac8ff0d97bec0fea
parentcfaea7ea3ce54d82c7ecda09553c5e96add67b4b
parent223ba5af042576dc3c4533c08250e2cbd78552ac
merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b