OSDN Git Service

merge in master-release history after reset to 6e048afb4bcac4118b09cc0dd01f0ca2a797a95a
authorThe Android Automerger <android-build@google.com>
Thu, 24 Apr 2014 12:49:37 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 24 Apr 2014 12:49:37 +0000 (05:49 -0700)
commit8cb54d12b6be969c14963a3ca81cddf43e10831a
tree4e0054168e5677b578b68f4ae7512b63ef31a4a9
parent6e048afb4bcac4118b09cc0dd01f0ca2a797a95a
parent6dc0b471a0430e0cdd5218fa4a2b308fb1035992
merge in master-release history after reset to 6e048afb4bcac4118b09cc0dd01f0ca2a797a95a