OSDN Git Service

merge in master-release history after reset to 018004496d88af5246e145d02573249de914d8c9
authorThe Android Automerger <android-build@google.com>
Thu, 24 Apr 2014 12:52:31 +0000 (05:52 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 24 Apr 2014 12:52:31 +0000 (05:52 -0700)
commit3e78ce795611a28fe9269c6a2a182b97946993c9
tree7588078868b7fe1db378df691ef966af8f593e6a
parent018004496d88af5246e145d02573249de914d8c9
parent762eb7a9ca612cec684066d83f877b957ab5fedb
merge in master-release history after reset to 018004496d88af5246e145d02573249de914d8c9