OSDN Git Service

merge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c
authorThe Android Automerger <android-build@google.com>
Sun, 11 May 2014 12:49:19 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 11 May 2014 12:49:19 +0000 (05:49 -0700)
commit7351e3edea10e2ca04215d4096ce869d905cbea2
tree38a531c2141dcbc47c9fb420b274fea340f46a47
parent6a9c9f75f80e26cca11b60c74aab447b86bd8c7c
parentac1ff11ce7aba3fe698774ac8166fc6301d89977
merge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c