OSDN Git Service

merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
authorThe Android Automerger <android-build@google.com>
Thu, 8 May 2014 12:50:37 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 8 May 2014 12:50:37 +0000 (05:50 -0700)
commit4fd04b156927529ff74131ee6b6af162a105fef7
tree9dfc881b282514aa942b29dfac8ff0d97bec0fea
parentcfaea7ea3ce54d82c7ecda09553c5e96add67b4b
parent4a98598b7047a834a65048152851bd3cb21916f1
merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b