OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Mon, 28 Oct 2013 14:49:52 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 28 Oct 2013 14:49:52 +0000 (07:49 -0700)
commitd48701254827b116e6402a77756c2441e8bd69b7
tree947b753e36dd5dc5299499677a05c58dff024f71
parent79cfe50c63eb74a173595772f2f7695293276c98
parente951f41431bf928d8e9b0ea34b2dd4ea05149808
merge in master-release history after reset to master