OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 15 Apr 2014 12:49:15 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 15 Apr 2014 12:49:15 +0000 (05:49 -0700)
commitb72ca681e57c06b997faf41120884c91574644c5
treef1217d0ac0a5f7b6cbe3297e26c635cff59a6a4b
parent74e22573a671f929c4d2daf526d72e49224f934f
parentf7bdc4828742e951f416d123cecf8a351217d35c
merge in master-release history after reset to master