OSDN Git Service

merge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654
authorThe Android Automerger <android-build@google.com>
Sun, 27 Apr 2014 12:49:51 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 27 Apr 2014 12:49:51 +0000 (05:49 -0700)
commit3c153084b020efcfff961925f0dc7a9ba3dd0aae
tree9dfc881b282514aa942b29dfac8ff0d97bec0fea
parentb8805e75ef4b4a014e7a42158018a79f87cce654
parentf1d61a293576b1cb5df9269c49f04bd1f181b753
merge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654