OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 31 Jul 2013 19:29:01 +0000 (12:29 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 31 Jul 2013 19:29:01 +0000 (12:29 -0700)
commit76cc164ffc9d8cc31ae78794798eab722254f55e
tree6753bc69bb16481c128c25c8edc757ca5e025bb9
parent4e464247619fb9c37c45f427ca0f301760244afc
parent16cf34165c335318b52b1dc221b1799a78222958
merge in master-release history after reset to master