OSDN Git Service

merge in master-release history after reset to 2a647f406c94a3a85e984c23428260dddea3f4ee
authorThe Android Automerger <android-build@google.com>
Tue, 20 May 2014 12:49:30 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 20 May 2014 12:49:30 +0000 (05:49 -0700)
commit58e1e0b57df450fd8bc902da045f0986a066feb1
tree0b10cc9a184f6cf25e1c1f6d881deb9620c238f3
parent2a647f406c94a3a85e984c23428260dddea3f4ee
parent7b0e4e446ac5ae6a7ea4386a4baa6777bc2e8a5c
merge in master-release history after reset to 2a647f406c94a3a85e984c23428260dddea3f4ee